Changeset View
Changeset View
Standalone View
Standalone View
lookandfeel/contents/components/Clock.qml
Show All 31 Lines | 27 | Item { | |||
---|---|---|---|---|---|
32 | width: clock.implicitWidth | 32 | width: clock.implicitWidth | ||
33 | height: clock.implicitHeight | 33 | height: clock.implicitHeight | ||
34 | 34 | | |||
35 | DropShadow { | 35 | DropShadow { | ||
36 | id: clockShadow | 36 | id: clockShadow | ||
37 | visible: !softwareRendering | 37 | visible: !softwareRendering | ||
38 | anchors.fill: clock | 38 | anchors.fill: clock | ||
39 | source: clock | 39 | source: clock | ||
40 | <<<<<<< HEAD | ||||
40 | horizontalOffset: 0 | 41 | horizontalOffset: 0 | ||
41 | verticalOffset: 2 | 42 | verticalOffset: 2 | ||
42 | radius: 14 | 43 | radius: 14 | ||
43 | samples: 32 | 44 | samples: 32 | ||
ngraham: If we're emulating the shadows in D16968, shouldn't this be 0.35? | |||||
rooty: Yes, but doesn't it look too jagged when it's 0.35?
0.35:
{F6639986}
0.25:
{F6639988} | |||||
44 | spread: 0.3 | 45 | spread: 0.3 | ||
45 | color: ColorScope.backgroundColor | 46 | color: ColorScope.backgroundColor | ||
47 | ======= | ||||
48 | horizontalOffset: 1 | ||||
49 | verticalOffset: 1 | ||||
50 | radius: 6 | ||||
51 | samples: 14 | ||||
52 | spread: 0.30 | ||||
53 | color: "black" // new Breeze shadow color | ||||
54 | >>>>>>> [sddm-theme/lock screen] Tighten clock shadows | ||||
"New" isn't going to be accurate for very long. :) We should also explain in the comment why we're hardcoding a color since this reflects a reversion of that change (continuity with Breeze shadow color, black looks better than gray, not even necessary to use a theme color since the text color is always white, etc) ngraham: "New" isn't going to be accurate for very long. :)
We should also explain in the comment why… | |||||
46 | } | 55 | } | ||
47 | 56 | | |||
48 | ColumnLayout { | 57 | ColumnLayout { | ||
49 | id: clock | 58 | id: clock | ||
50 | Label { | 59 | Label { | ||
51 | text: Qt.formatTime(timeSource.data["Local"]["DateTime"]) | 60 | text: Qt.formatTime(timeSource.data["Local"]["DateTime"]) | ||
52 | style: softwareRendering ? Text.Outline : undefined | 61 | style: softwareRendering ? Text.Outline : undefined | ||
53 | styleColor: softwareRendering ? ColorScope.backgroundColor : undefined | 62 | styleColor: softwareRendering ? ColorScope.backgroundColor : undefined | ||
Show All 18 Lines |
If we're emulating the shadows in D16968, shouldn't this be 0.35?