git.iko.soy/unity8
on xenial help sign in
Merge remote-tracking branch 'origin/xenial_-_qt-5-12' into xenial_-_qt-5-12_-_wayland
commit2a9a735e817e4e92ebe7f64c577b68fc04479a65 authorRodney Dawes <dobey@ubports.com> dateThu 5 Nov 2020, 17:52 (6 years ago) parent1a2034b494a966
5 files changed+13−14
compare with xenial
unifiedsplit
qml/Notifications/Notification.qml+8−3 qml/Notifications/NotificationButton.qml+2−1 qml/Stage/Splash.qml−5 tests/qmltests/ApplicationMenus/tst_MenuBar.qml+2−2 tests/qmltests/Greeter/tst_NarrowView.qml+1−3
qml/Notifications/Notification.qml+8−3
@@ -464,7 +464,8 @@ StyledItem {
464464 text: oneOverTwoLoaderTop.actionLabel
465465 outline: notification.hints["x-canonical-private-affirmative-tint"] !== "true"
466466 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"
468469 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
469470 }
470471 }
@@ -494,7 +495,8 @@ StyledItem {
494495 text: oneOverTwoLoaderBottom.actionLabel
495496 outline: notification.hints["x-canonical-private-rejection-tint"] !== "true"
496497 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"
498500 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
499501 }
500502 }
@@ -556,7 +558,10 @@ StyledItem {
556558 outline: (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] !== "true") ||
557559 (index == 1 && notification.hints["x-canonical-private-rejection-tint"] !== "true")
558560 color: {
559− var result = theme.palette.normal.foreground;
561+ var result = "#666";
562+ if (theme.name == "Ubuntu.Components.Themes.SuruDark") {
563+ result = "#888"
564+ }
560565 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] === "true") {
561566 result = theme.palette.normal.positive;
562567 }
qml/Notifications/NotificationButton.qml+2−1
@@ -38,7 +38,8 @@ Rectangle {
3838 fontSize: "medium"
3939 font.weight: Font.Light
4040 anchors.centerIn: root
41− color: outline ? theme.palette.normal.backgroundSecondaryText : "white"
41+ color: theme.name == "Ubuntu.Components.Themes.SuruDark" ? "#111"
42+ : "white"
4243 visible: text !== ""
4344 }
4445
qml/Stage/Splash.qml−5
@@ -92,12 +92,7 @@ Item {
9292 id: overlaidImage
9393 anchors.centerIn: parent
9494 anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
95− sourceSize {
96− width: root.width
97− height: root.height
98− }
9995 asynchronous: true
100− fillMode: Image.PreserveAspectFit
10196 cache: false
10297 clip: true
10398 }
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+2−2
@@ -349,7 +349,7 @@ Item {
349349 var menu = { "rowData": { "label": "Short" } };
350350 tryCompareFunction(function() {
351351 menuBackend.insertRow(0, menu);
352− wait(1);
352+ waitForRendering(menuBar);
353353 if (overflow.visible) {
354354 return true;
355355 }
@@ -366,7 +366,7 @@ Item {
366366
367367 tryCompareFunction(function() {
368368 menuBackend.removeRow(0);
369− wait(1);
369+ waitForRendering(menuBar);
370370 if (!overflow.visible) {
371371 return true;
372372 }
tests/qmltests/Greeter/tst_NarrowView.qml+1−3
@@ -444,9 +444,7 @@ Item {
444444 var dataCircle = findChild(view, "dataCircle");
445445 verify(dataCircle);
446446
447− tap(dataCircle);
448− wait(200);
449− tap(dataCircle);
447+ mouseDoubleClickSequence(dataCircle);
450448
451449 tryCompare(infographicDataChangedSpy, "count", 1);
452450 }