diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2020-07-16 13:50:44 +0200 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2020-07-16 14:45:28 +0200 |
| commit | a4325588bcd8679a63c3ab9321afe1aac0632341 (patch) | |
| tree | b2014c5c65d637aa694755e762a9f896869109e3 | |
| parent | a4e63905b1320b146a826b924ecf5f8844f341ee (diff) | |
| download | gtk+-wip/jimmac/dialog-buttons-fix.tar.gz | |
Adwaita: dialog button roundingwip/jimmac/dialog-buttons-fix
- fix :active corner rounding
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/2935
| -rw-r--r-- | demos/widget-factory/widget-factory.ui | 6 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 0083826df7..fc4298eef7 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -3002,6 +3002,12 @@ bad things might happen.</property> </object> </child> <child type="action"> + <object class="GtkButton" id="wait_info_dialog"> + <property name="label" translatable="yes">_Wait</property> + <property name="use-underline">1</property> + </object> + </child> + <child type="action"> <object class="GtkButton" id="doit_info_dialog"> <property name="label" translatable="yes">_Do It</property> <property name="use-underline">1</property> diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index a7646eade7..bb7f9cec80 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -3213,8 +3213,8 @@ window.dialog.message { // Message Dialog styling background-image: none; background-color: $bg_color; border-style: none; - border-top-left-radius: 7px; - border-top-right-radius: 7px; + border-top-left-radius: $window_radius - 1; + border-top-right-radius: $window_radius - 1; } box.dialog-vbox.vertical { @@ -3240,13 +3240,12 @@ window.dialog.message { // Message Dialog styling border-right-style: none; border-bottom-style: none; - &:first-child{ - border-left-style: none; - border-bottom-left-radius: 7px; + &:first-child { //seems to be ignored but applied for second button's :active state + border-radius: 0 0 0 #{$window_radius - 1}; } &:last-child { - border-bottom-right-radius: 7px; + border-radius: 0 0 #{$window_radius - 1} 0; } } } |