[gtk] Adwaita: Just use .menu, instead of .appmenu



commit f84ecf9cd2201fb12243dbf74961428817c76a64
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 23 11:15:51 2020 -0500

    Adwaita: Just use .menu, instead of .appmenu
    
    No need for this one-off class, there's no other menus
    that could show up here.

 gtk/gtkheaderbar.c                       | 4 ++--
 gtk/theme/Adwaita/_common.scss           | 2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css | 2 +-
 gtk/theme/Adwaita/gtk-contained.css      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 7b82bb831d..0c8100872d 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -73,7 +73,7 @@
  * ├── box.start
  * │   ╰── box
  * │       ├── [image.titlebutton.icon]
- * │       ├── [menubutton.titlebutton.appmenu]
+ * │       ├── [menubutton.titlebutton.menu]
  * │       ├── [button.titlebutton.minimize]
  * │       ├── [button.titlebutton.maximize]
  * │       ╰── [button.titlebutton.close]
@@ -406,7 +406,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
                   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
                   gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (button), menu);
                   gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton");
-                  gtk_style_context_add_class (gtk_widget_get_style_context (button), "appmenu");
+                  gtk_style_context_add_class (gtk_widget_get_style_context (button), "menu");
                   image = gtk_image_new ();
                   gtk_menu_button_add_child (GTK_MENU_BUTTON (button), image);
                   gtk_widget_set_can_focus (button, FALSE);
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index f40953d6c9..b3136aac01 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4576,7 +4576,7 @@ button.titlebutton {
 
   @include _button_text_shadow;
 
-  &:not(.appmenu) {
+  &:not(.menu) {
     border-radius: 9999px;
     -gtk-outline-radius: 9999px;
     padding: 6px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 06c2fd7252..54b9031188 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1889,7 +1889,7 @@ messagedialog.csd decoration { border-radius: 8px; box-shadow: 0 1px 2px rgba(0,
 
 button.titlebutton { text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 
0.834353); }
 
-button.titlebutton:not(.appmenu) { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 6px; margin: 
0 2px; min-width: 0; min-height: 0; }
+button.titlebutton:not(.menu) { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 6px; margin: 0 
2px; min-width: 0; min-height: 0; }
 
 button.titlebutton:backdrop { -gtk-icon-shadow: none; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 143aa50d91..463233e20f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1905,7 +1905,7 @@ messagedialog.csd decoration { border-radius: 8px; box-shadow: 0 1px 2px rgba(0,
 
 button.titlebutton { text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 
255, 255, 0.769231); }
 
-button.titlebutton:not(.appmenu) { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 6px; margin: 
0 2px; min-width: 0; min-height: 0; }
+button.titlebutton:not(.menu) { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 6px; margin: 0 
2px; min-width: 0; min-height: 0; }
 
 button.titlebutton:backdrop { -gtk-icon-shadow: none; }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]