Gtk.StyleContext, Gtk.StyleClass avoid and replace where possible #2552

jeremypw · 2025-03-17T13:35:21Z

Simple avoidance/replacement of stylecontext use.

Style providers added to display instead of widgets. May need changes to css files and css names later.

Rendering will be addressed separately.

…econtext

jeremypw · 2025-06-13T12:11:48Z

Some of these changes could be done in Gtk3?

leonardo-lemos · 2025-06-13T14:11:53Z

libcore/ConnectServerDialog.vala

-        // info_bar.get_content_area ().add (info_label);
+
+        info_bar.add_css_class (Granite.STYLE_CLASS_FRAME);
+        // info_bar.get_content_area ()add (info_label);


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:12:06Z

libcore/Widgets/BasicBreadcrumbsEntry.vala

-            notify["scale-factor"].connect (() => {
-                breadcrumb_icons.scale = scale_factor;
-            });
+            // notify["scale-factor"].connect (() => {


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:14:47Z

libcore/Widgets/BasicBreadcrumbsEntry.vala

-                weak Gtk.StyleContext style_context = get_style_context ();
-                // var padding = style_context.get_padding (style_context.get_state ());
-                // w += (l - 1) * (MINIMUM_BREADCRUMB_WIDTH + padding.left + padding.right);
+                w += (l - 1) * (MINIMUM_BREADCRUMB_WIDTH);


The commented-out code was summing two padding values. Is it okay that we’re no longer doing that?

leonardo-lemos · 2025-06-13T14:16:24Z

libcore/Widgets/BasicBreadcrumbsEntry.vala

-            if (breadcrumb_icons.scale != scale) {
-                breadcrumb_icons.scale = scale;
+            int scale = get_scale_factor ();
+            // if (breadcrumb_icons.scale != scale) {


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:16:27Z

libcore/Widgets/BasicBreadcrumbsEntry.vala

-                }
-                set_element_icons (protocol, elements);
-            }
+            //     string protocol = "";


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:16:43Z

libcore/Widgets/BreadcrumbElement.vala

@@ -236,8 +235,8 @@ public class Files.View.Chrome.BreadcrumbElement : Object {
        if (is_rtl) {
            if (icon_to_draw == null) {
                if (room_for_text) {
-                    button_context.render_layout (cr, x - width,
-                                                  y_half_height - text_half_height, layout);
+                    // button_context.render_layout (cr, x - width,


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:06Z

libcore/Widgets/BreadcrumbElement.vala

@@ -261,8 +260,8 @@ public class Files.View.Chrome.BreadcrumbElement : Object {

            if (icon_to_draw == null) {
                if (room_for_text) {
-                    button_context.render_layout (cr, x,
-                                                  y_half_height - text_half_height, layout);
+                    // button_context.render_layout (cr, x,


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:11Z

libcore/Widgets/BreadcrumbElement.vala

@@ -275,8 +274,8 @@ public class Files.View.Chrome.BreadcrumbElement : Object {
                    cr.restore ();
                }
                if (text_is_displayed && room_for_text && x > 0) {
-                    button_context.render_layout (cr, x + iw,
-                                                  y_half_height - text_half_height, layout);
+                    // button_context.render_layout (cr, x + iw,


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:14Z

libcore/Widgets/BreadcrumbElement.vala

-            button_context.render_frame (cr, -height / 2, -height / 2, height, height);
-            button_context.restore ();
+            // button_context.save ();
+            // button_context.add_class ("noradius-button");


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:18Z

libcore/Widgets/BreadcrumbElement.vala

-            button_context.add_class ("noradius-button");
-            button_context.render_frame (cr, -height / 2, -height / 2, height, height);
-            button_context.restore ();
+            // button_context.save ();


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:22Z

libcore/Widgets/BreadcrumbElement.vala

@@ -332,7 +331,7 @@ public class Files.View.Chrome.BreadcrumbElement : Object {
            x += half_height;
        }

-        button_context.restore ();
+        // button_context.restore ();


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:27Z

libcore/Widgets/BreadcrumbIconList.vala

            }
+            // set {


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:36Z

plugins/pantheon-files-ctags/plugin.vala

-    //             var style_context = get_style_context ();
-    //             style_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-    //             style_context.add_class ("nohover");
+    //             add_css_class ("nohover");


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:17:52Z

plugins/pantheon-files-ctags/plugin.vala

@@ -237,7 +238,7 @@ public class Files.Plugins.CTags : Files.Plugins.Base {
    //             return true;
    //         }

-    //         if (Gtk.StateFlags.DIR_RTL in get_style_context ().get_state ()) {
+            // if (Gtk.TextDirection.RTL in get_direction ())


There's a commented out code here.

leonardo-lemos · 2025-06-13T14:18:13Z

src/View/AbstractDirectoryView.vala

@@ -3281,13 +3280,13 @@ namespace Files {
        public virtual bool on_view_draw (Cairo.Context cr) {
            /* If folder is empty, draw the empty message in the middle of the view
             * otherwise pass on event */
-            var style_context = get_style_context ();
+            // var style_context = get_style_context ();


There's a commented out code here.

leonardo-lemos

Code looks good but there's a lot of commented-out code and a one comment.

jeremypw · 2025-06-14T14:34:22Z

@leonardo-lemos Sorry, this should have been set to draft really. As it is being merged into an intermediate gtk4 branch it is expected that some of the gtk3 code will have been commented out temporarily as each PR is only intended to address one aspect of porting - in this case style classes. in order to make easier to review.

As the Gtk3 version is still changing and the preparation phase is not finished these PRs are probably premature anyway.

jeremypw added 5 commits March 17, 2025 12:22

Replace add_class; reduce use of style_context; replace remaining add ()

9c10a04

Do not use style_context.render; scale_factor read-only; corrections

2c1d97e

Avoid or comment out more uses of style_context

b9f3614

More Gtk style classes -> Granite

6ec96f1

Revert some out of scope changes causing conflict

b1c4dfd

jeremypw mentioned this pull request Mar 19, 2025

Gtk4 skeleton #2549

Draft

3 tasks

Merge branch 'jeremypw/gtk4-skeleton' into jeremypw/gtk4skeleton/styl…

0b19670

…econtext

jeremypw added the Gtk4 Issues that involve Gtk4 code label Jun 9, 2025

jeremypw added this to GTK4 Porting Jun 9, 2025

jeremypw added the Status: Blocked Cannot proceed until another issue is fixed label Jun 9, 2025

jeremypw added this to the 8.0.0 milestone Jun 13, 2025

leonardo-lemos reviewed Jun 13, 2025

View reviewed changes

libcore/Widgets/BreadcrumbIconList.vala

}

// set {

Copy link

Collaborator

leonardo-lemos Jun 13, 2025

Choose a reason for hiding this comment

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

There's a commented out code here.

leonardo-lemos reviewed Jun 13, 2025

View reviewed changes

leonardo-lemos requested changes Jun 13, 2025

View reviewed changes

jeremypw marked this pull request as draft June 14, 2025 14:34

Uh oh!

Gtk.StyleContext, Gtk.StyleClass avoid and replace where possible #2552

Are you sure you want to change the base?

Gtk.StyleContext, Gtk.StyleClass avoid and replace where possible #2552

Uh oh!

Conversation

jeremypw commented Mar 17, 2025

Uh oh!

jeremypw commented Jun 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

leonardo-lemos left a comment

Choose a reason for hiding this comment

Uh oh!

jeremypw commented Jun 14, 2025

Uh oh!

Uh oh!