Skip to content

Commit 7e3e7c5

Browse files
authored
Styles/Scale: style values (#829)
1 parent 5dcd835 commit 7e3e7c5

File tree

3 files changed

+42
-1
lines changed

3 files changed

+42
-1
lines changed

demo/Views/ControlsView.vala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public class ControlsView : DemoPage {
127127
var scale_header = new Granite.HeaderLabel ("Scale");
128128

129129
var hscale = new Gtk.Scale.with_range (HORIZONTAL, 0, 1, 0.01) {
130+
draw_value = true,
130131
hexpand = true
131132
};
132133
hscale.adjustment.value = 0.5;

lib/Styles/Gtk/Scale.scss

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ scale {
3030
min-width: $trough-width;
3131
}
3232

33+
value {
34+
@extend .small-label;
35+
@extend .numeric;
36+
}
37+
3338
&.dragging {
3439
slider {
3540
transform: scale(1.1);
@@ -55,6 +60,41 @@ scale {
5560
slider {
5661
margin: $slider-margin -1px;
5762
}
63+
64+
value {
65+
// Padding + text height + margin
66+
$value-osd-height: (rem(6px) * 2) + 0.85rem + rem(6px);
67+
68+
&.bottom,
69+
&.top {
70+
@extend .osd;
71+
72+
opacity: 0;
73+
transform: scale(0.9);
74+
transition:
75+
opacity duration("in-place") easing(),
76+
transform duration("collapse") easing();
77+
}
78+
79+
&.bottom {
80+
margin-bottom: $value-osd-height * -1;
81+
margin-top: rem(3px);
82+
}
83+
84+
&.top {
85+
margin-bottom: rem(3px);
86+
margin-top: $value-osd-height * -1;
87+
}
88+
}
89+
90+
&.dragging value {
91+
&.bottom,
92+
&.top {
93+
opacity: 1;
94+
transform: scale(1);
95+
transition: transform duration("expand") easing("ease-out-back");
96+
}
97+
}
5898
}
5999

60100
&.vertical {

lib/Styles/_label.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
// Intended to match the Pango size of `<small>` and `size='smaller'`
4242
.small-label {
43-
font-size: 0.85em;
43+
font-size: 0.85rem;
4444
}
4545

4646
.error {

0 commit comments

Comments
 (0)