[gtk/wip/jimmac/dialog-buttons-fix] Adwaita: dialog button rounding
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/dialog-buttons-fix] Adwaita: dialog button rounding
- Date: Thu, 16 Jul 2020 12:45:59 +0000 (UTC)
commit a4325588bcd8679a63c3ab9321afe1aac0632341
Author: Jakub Steiner <jimmac gmail com>
Date: Thu Jul 16 13:50:44 2020 +0200
Adwaita: dialog button rounding
- fix :active corner rounding
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/2935
demos/widget-factory/widget-factory.ui | 6 ++++++
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
@@ -3001,6 +3001,12 @@ bad things might happen.</property>
<property name="use-underline">1</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>
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;
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]