git.iko.soy/unity8
on xenial help sign in
Merge remote-tracking branch 'origin/xenial' into xenial_-_qt-5-12
5aa85bbRodney Dawes
qml/Notifications/Notification.qml+8−3
compare with xenial
unifiedsplit
@@ -464,7 +464,8 @@ StyledItem {
464 text: oneOverTwoLoaderTop.actionLabel
464 text: oneOverTwoLoaderTop.actionLabel
465 outline: notification.hints["x-canonical-private-affirmative-tint"] !== "true"
465 outline: notification.hints["x-canonical-private-affirmative-tint"] !== "true"
466 color: notification.hints["x-canonical-private-affirmative-tint"] === "true" ? theme.palette.normal.positive
466 color: notification.hints["x-canonical-private-affirmative-tint"] === "true" ? theme.palette.normal.positive
467− : theme.palette.normal.foreground
467+ : theme.name == "Ubuntu.Components.Themes.SuruDark" ? "#888"
468+ : "#666"
468 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
469 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
469 }
470 }
470 }
471 }
@@ -494,7 +495,8 @@ StyledItem {
494 text: oneOverTwoLoaderBottom.actionLabel
495 text: oneOverTwoLoaderBottom.actionLabel
495 outline: notification.hints["x-canonical-private-rejection-tint"] !== "true"
496 outline: notification.hints["x-canonical-private-rejection-tint"] !== "true"
496 color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] === "true" ? theme.palette.normal.negative
497 color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] === "true" ? theme.palette.normal.negative
497− : theme.palette.normal.foreground
498+ : theme.name == "Ubuntu.Components.Themes.SuruDark" ? "#888"
499+ : "#666"
498 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
500 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
499 }
501 }
500 }
502 }
@@ -556,7 +558,10 @@ StyledItem {
556 outline: (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] !== "true") ||
558 outline: (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] !== "true") ||
557 (index == 1 && notification.hints["x-canonical-private-rejection-tint"] !== "true")
559 (index == 1 && notification.hints["x-canonical-private-rejection-tint"] !== "true")
558 color: {
560 color: {
559− var result = theme.palette.normal.foreground;
561+ var result = "#666";
562+ if (theme.name == "Ubuntu.Components.Themes.SuruDark") {
563+ result = "#888"
564+ }
560 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] === "true") {
565 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] === "true") {
561 result = theme.palette.normal.positive;
566 result = theme.palette.normal.positive;
562 }
567 }
qml/Notifications/NotificationButton.qml+2−1
@@ -38,7 +38,8 @@ Rectangle {
38 fontSize: "medium"
38 fontSize: "medium"
39 font.weight: Font.Light
39 font.weight: Font.Light
40 anchors.centerIn: root
40 anchors.centerIn: root
41− color: outline ? theme.palette.normal.backgroundSecondaryText : "white"
41+ color: theme.name == "Ubuntu.Components.Themes.SuruDark" ? "#111"
42+ : "white"
42 visible: text !== ""
43 visible: text !== ""
43 }
44 }
44
45
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+2−2
@@ -349,7 +349,7 @@ Item {
349 var menu = { "rowData": { "label": "Short" } };
349 var menu = { "rowData": { "label": "Short" } };
350 tryCompareFunction(function() {
350 tryCompareFunction(function() {
351 menuBackend.insertRow(0, menu);
351 menuBackend.insertRow(0, menu);
352− wait(1);
352+ waitForRendering(menuBar);
353 if (overflow.visible) {
353 if (overflow.visible) {
354 return true;
354 return true;
355 }
355 }
@@ -366,7 +366,7 @@ Item {
366
366
367 tryCompareFunction(function() {
367 tryCompareFunction(function() {
368 menuBackend.removeRow(0);
368 menuBackend.removeRow(0);
369− wait(1);
369+ waitForRendering(menuBar);
370 if (!overflow.visible) {
370 if (!overflow.visible) {
371 return true;
371 return true;
372 }
372 }
tests/qmltests/Greeter/tst_NarrowView.qml+1−3
@@ -444,9 +444,7 @@ Item {
444 var dataCircle = findChild(view, "dataCircle");
444 var dataCircle = findChild(view, "dataCircle");
445 verify(dataCircle);
445 verify(dataCircle);
446
446
447− tap(dataCircle);
448− wait(1);
449− tap(dataCircle);
447+ mouseDoubleClickSequence(dataCircle);
450
448
451 tryCompare(infographicDataChangedSpy, "count", 1);
449 tryCompare(infographicDataChangedSpy, "count", 1);
452 }
450 }