Skip to content

menubutton: Fix default icon - #1356

Open
ryonakano wants to merge 3 commits into
mainfrom
ryonakano/menubutton-fixicon
Open

ryonakano wants to merge 3 commits into
mainfrom
ryonakano/menubutton-fixicon

Conversation

@ryonakano

Copy link
Copy Markdown
Member

Backport of elementary/granite#1027 and elementary/granite#1055

File Roller built with this branch (d58fee2):

image

It still shows the arrow icons if you specify Gtk.ArrowType.UP for example:

image
A patch to build this branch inside the sanbox
diff --git a/org.gnome.FileRoller.json b/org.gnome.FileRoller.json
index 8450685..dc831bd 100644
--- a/org.gnome.FileRoller.json
+++ b/org.gnome.FileRoller.json
@@ -99,6 +99,65 @@
                 }
             ]
         },
+        {
+            "name": "stylesheet",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/elementary/stylesheet.git",
+                    "commit": "d58fee241beaded878bd518932b79a7436675a77",
+                    "x-checker-data": {
+                        "type": "git",
+                        "tag-pattern": "^([\\d.]+)$"
+                    }
+                }
+            ],
+            "modules": [
+                {
+                    "name": "sassc",
+                    "cleanup": [
+                        "*"
+                    ],
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://github.com/sass/sassc.git",
+                            "tag": "3.6.2"
+                        },
+                        {
+                            "type": "script",
+                            "dest-filename": "autogen.sh",
+                            "commands": [
+                                "autoreconf -si"
+                            ]
+                        }
+                    ],
+                    "modules": [
+                        {
+                            "name": "libsass",
+                            "cleanup": [
+                                "*"
+                            ],
+                            "sources": [
+                                {
+                                    "type": "git",
+                                    "url": "https://github.com/sass/libsass.git",
+                                    "tag": "3.6.5"
+                                },
+                                {
+                                    "type": "script",
+                                    "dest-filename": "autogen.sh",
+                                    "commands": [
+                                        "autoreconf -si"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
         {
             "name": "file-roller",
             "buildsystem": "meson",

Comment thread src/gtk-3.0/widgets/_menubuttons.scss Outdated
// Use non-arrow icon when no direction specified, assuming use case as a
// main menu button
// Assuming use case as a main menu button
> button.image-button arrow.none, arrow.down {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is correct for GTK3? Do we have a test case for this? A lot of selectors changed between 3 and 4

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested for GTK 3. And now I noticed .image-button isn't mentioned in the GTK 3 version of the documentation so this may not work……I'll check what I should do for GTK 3.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is correct for GTK3?

It's not correct 😵

GTK 3 (granite-demo):

image

GTK 4 (granite-9-demo):

image

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we have no way to get the direction in CSS in GTK 3? So probably we should remove src/gtk-3.0/widgets/_menubuttons.scss itself.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in 3a3144a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants