Ported to GTK4 #290

trigg · 2025-02-16T14:04:58Z

Extensive changes to bring the code base up to working on GTK4.

Dependencies:

gtkmm 3 > 4 (same for gdk, glib so on)
gtk-layer-shell > gtk4-layer-shell
libdbusmenu-gtk3 > libdbusmenu-glib

Material changes overview:

The menus on system tray icons had to be rewritten from scratch as the supporting library appears to not be available for gtk4
- Menu & items are regenerated when changed over the dbus wire
- Icons appear to be getting ignored by Popover Menu. From all my reading this is intentional on GTK4s part
- Dbus library answers that there are no tickbox or radio button variants despite testing intentionally for them. These menu items function correctly but don't display the radio/checkmark
- I am convinced there are some memory leaks here and am squashing them as I find them
The entirety of the event handling side of GTK has been rewritten and redefined.
- System tray icons, Window list windows and application menu context buttons are all now MenuButton allowing us to connect menu options to them
- EventBox no longer exists, so event callbacks are connected in directly to widgets
- Volume control slider popup stops scroll wheel & swipe events on button, so the popup no longer shows when volume changes
Size allocation events, Redraw events, Scale change events have been removed from gtk4 and considered "the wrong way to do things" for most uses
- Widgets should not base their internal logic on position & size
- Scale is left to GTK4 to account for in all cases
- Icon size should be changed with CSS rules only
- All icon_size options have been fed into CSS Styles that are generated & updated from config
Output management and hotplugging is managed differently and worth double and triple checking by people with less boring monitor layouts than mine
Font override is removed. The only way I can see to do this now is to set it via CSS. While feeding the data in from the config is possible the way people write this options currently won't work in GTK4
- Size needs to be in pixels or css sizes like : 17px 1.2em 0.9rem

While I was in the area:

Implemented CSS directory loading for dock and background
Added some hover, open window & close window animations to default css
Added a dock window-close-animation option as it has adverse effects if you enable it but don't update your default css
Realised we'd be better served with a Gtk Revealer... but that's a bigger task that I'll do in a separate attempt.
Reworked Background, needs sanity check as I'm sure it'll leak memory

I'm sure there's more, and will edit this as and when possible.

I look forward to uncrustify.

Update from upstream

- - Almost everything is broken. - - This is expected

- - This is insane. - - No, how is this even usable - - Well whatever. - - Someone please valgrind because I'm sure there's lots of bad ideas here.

- Fixes #8 - Partially fixes #9 - - Menu icons are currently still not shown - - Menu checkboxes and radios show as generic label only - Fixes #15 - Fixes #20

- Some changes to SNI dbusmenu - Getting occassional segfaults in SNI dbusmenu so these need a better read-through before calling it

- - Still inherently broken until dbusmenu-glib reports a type back

- Dock takes entire width but sets itself to click-through on the outside - Switched panel to using CenterBox which does a better job than my implementation - Moved CSS dir loading into base app class

- First attempt at output changes

- Output hot plugging sorted. - - This will need testing by people with more than 1 external monitor to see if there's any unknowns.

- Add an option to animate icons removed from dock - Added to default dock CSS

- Fixed #4

- Fixed rectangle hints in dock and panel - Fixed volume scrolling

- Fixed changing fill type in background triggering a new image load - Remove GTK interactive debugging

Swap the x texture coordinates because the images were reversed.

background: Rewrite to use GL instead of cairo for rendering

Before, we were uploading a texture twice: once when it's picked and once after it switches to fade out. This makes it so the old texture id is reused when fading to a new image, and avoids a call to glTexImage2D.

background: Optimize texture uploading by only calling glTexImage2D once

Fixes #45.

window-list: Set minimize target more reliably

window-list: Set minimize target even more reliably

ammen99 · 2025-06-16T07:44:01Z

Hi and thanks for the big PR, very nice to see the update! I am going through the code to familiarize myself with whatever changes you have made, in the meantime I tried to copy the default CSS files and to compare the old and the new wf-panel. There are some very annoying differences which I am not sure how to solve, maybe they depend on the theme? Here is a screenshot, above is current master, below is this branch:

Most notably: backgrounds for menu, command and clock seem to not be unset, and there is a dark/black background behind the launchers instead of semi-transparent. Ditto for the ethernet connection. Icons also appear quite different.

ammen99 · 2025-06-16T07:48:37Z

I am also getting Gtk-WARNING **: 09:47:31.071: Theme parser error: panel-selectors.css:21:11-20: Expected a number which I am not sure what to do about, I thought font could be monospace ...

ammen99 · 2025-06-16T08:54:29Z

Window-list also appears weird:

ammen99

I looked over the changes, really good work :) My focus was the structure, haven't looked at every single UI call in detail but I assume we will find bugs like that during testing. A few things that I noticed or questions that I have.

ammen99 · 2025-05-02T10:13:53Z

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "subprojects/wayland-logout"]
 	path = subprojects/wayland-logout
 	url = https://github.com/soreau/wayland-logout
+[submodule "subprojects/gtk4-layer-shell"]


Shouldn't we remove the gtk-layer-shell submodule (which is for gtk3)?

Unless I've missed something, that is GTK4, not 3

Sure, this is the good one, but the 3 version is also there in the gitmodules (unless I am mistaken)

So it is, but .git/config had the right of it, and it seemed to be ignoring .gitmodules. Strange, but okay.

ammen99 · 2025-06-16T07:49:47Z

src/panel/panel.cpp

-         * the lifetime of the output */
-        return true;
+        // window->signal_close_request().connect(
+        // sigc::mem_fun(*this, &WayfirePanel::impl::on_delete));


if this is not needed anymore we cna just delete the code, no need to leave it commented :)

Yeah, that's a running bad habit of mine. Sorry!

ammen99 · 2025-06-16T07:54:48Z

src/panel/panel.cpp

@@ -315,6 +291,24 @@ class WayfirePanel::impl
  public:
    impl(WayfireOutput *output) : output(output)
    {
+        // Intentionally leaking feels bad.


I wonder whether these shouldn't be static variables. We don't need one instance per output, right? This creates new objects every time we plug an output, but if they were static variables, they would be initialized just once for all outputs.

I've moved them up into the App class, during on_activate. This is a much better position for them

ammen99 · 2025-06-16T07:55:28Z

src/panel/panel.cpp

+        // So on
+        new CssFromConfigFont("panel/battery_font", ".battery {", "}");
+        new CssFromConfigFont("panel/clock_font", ".clock {", "}");
+


+1000 for the idea to translate .ini to css, I really like the solution :)

It seemed like the thing to do at the time.

I've had to re-write the font handling as it was broken again, and it hadn't been handling people using fonts like NotoSans 10 to assume 10pt. It now assumes pt if no unit is given from px rem or em

ammen99 · 2025-06-16T09:00:19Z

src/panel/widgets/window-list/window-list.cpp

-    return result;
-}
-
-void WayfireWindowListBox::forall_vfunc(gboolean value, GtkCallback callback, gpointer callback_data)


The purpose of this code was to ensure that we can drag and drop toplevels in the list to rearrange them. I assume that custom drawing is no longer as simple as this code implements it?

If so, could we make use of gtk drag and drop to rearrange toplevels, potentially showing a drag icon? Currently, drag and drop does rearrange the toplevels but there is no animation and no indication of what is going on, which I personally find a bit confusing.

In addition, at the end of the drag and drop, the dragged view gets a special status (probably 'active drag and drop') and remains like that, so we have to unset somethinig probably.

Theoretically, we could subclass a LayoutManager, and write our own logic on size and location of children.

In reality I can't make it compile when I try.

- Removed some commented code

- Fixed font config...

trigg and others added 30 commits February 8, 2025 16:02

Merge pull request #1 from WayfireWM/master

b599eba

Update from upstream

- Initial switch over to GTK4.

1ea0ce7

- - Almost everything is broken. - - This is expected

- Custom readme to explain fork

1c22163

- Fixed #11 scrolling on volume widget

39e11d0

- Implemented gbusmenu-glib

a681107

- - This is insane. - - No, how is this even usable - - Well whatever. - - Someone please valgrind because I'm sure there's lots of bad ideas here.

- some house keeping

f9081e8

- Fixes #7

e25bf2e

- Fixes #8 - Partially fixes #9 - - Menu icons are currently still not shown - - Menu checkboxes and radios show as generic label only - Fixes #15 - Fixes #20

- Moved all icon_size variables out of widget logic

4e34203

- Fixes #19

b9b1103

- fixed #14

b19796a

- Fixed #21

aba5c1a

- Toplevel button context menu clean up. fixed #24

86857c3

- Some changes to SNI dbusmenu - Getting occassional segfaults in SNI dbusmenu so these need a better read-through before calling it

- Sanity check for SNI menu checkbox and radio

07bb42a

- - Still inherently broken until dbusmenu-glib reports a type back

- Fixed #16

64696f4

- Remove TODO

b462a39

- Code cleanup

ee643a9

- Fix app menu scroll

e3e3782

- Font via CSS

c0d3661

- Fixed & updated wf-background

bb36c9f

- Remove cout spam

34254f5

- Dock css styling added

3cfbdd2

- Dock takes entire width but sets itself to click-through on the outside - Switched panel to using CenterBox which does a better job than my implementation - Moved CSS dir loading into base app class

- Implemented central string to icon logic

fd6b425

- First attempt at output changes

- Fixed leak on output unplug

24a02e0

- Output hot plugging sorted. - - This will need testing by people with more than 1 external monitor to see if there's any unknowns.

- Use an animation callback for background fade

5f58c21

- Add an option to animate icons removed from dock - Added to default dock CSS

- Fixed #5

ff1d774

- Fixed #4

- Dock click region fixes

6afcad2

- Fixed rectangle hints in dock and panel - Fixed volume scrolling

- Remove my off-by-one testing

44aba39

- Fixed incorrect fade logic in background

37ed25c

- Fixed changing fill type in background triggering a new image load - Remove GTK interactive debugging

- Fixed #25

601d5a7

- Fixed notifications

303b264

trigg and others added 21 commits May 5, 2025 02:34

- Improve logout button

01e8cd8

background: Rewrite to use GL instead of cairo for rendering

cd3c389

background: Fix incorrect image mirroring

c0832fe

Swap the x texture coordinates because the images were reversed.

background: Whitespace fixes

0a90527

- Fix quirks and crashes in menu

8c179cd

- uncrustify

d2143c4

- uncrust

965b90c

background: Apply adjustments for fill modes

40fce4d

background: Fix preserve_aspect fill mode

28cf6fd

Merge pull request #43 from soreau/wf-background-gl

a0ff555

background: Rewrite to use GL instead of cairo for rendering

- uncrustify

6b32d84

- extend click range of menu button outside of button

4079e5f

- uncrustify

5beaefa

background: Optimize texture uploading by only calling glTexImage2D once

ea65bb6

Before, we were uploading a texture twice: once when it's picked and once after it switches to fade out. This makes it so the old texture id is reused when fading to a new image, and avoids a call to glTexImage2D.

Merge pull request #44 from soreau/wf-background-gl

21a1d72

background: Optimize texture uploading by only calling glTexImage2D once

window-list: Set minimize target more reliably

3a62cdb

Fixes #45.

Merge pull request #46 from soreau/fix-45

2d91dbd

window-list: Set minimize target more reliably

- uncrustify pt1

0f8a9b3

- uncrustify pt2

809ed1f

window-list: Set minimize target even more reliably

cc3fde4

Merge pull request #47 from soreau/fix-45-again

50ecfb2

window-list: Set minimize target even more reliably

ammen99 requested changes Jun 16, 2025

View reviewed changes

trigg added 5 commits July 3, 2025 12:51

- Moved ConfigCSS up into App class from panel and dock

97ab901

- Removed some commented code

- uncrustify

3918b30

- Fixed bare sizes in font config

252e7f8

- Fixed font config...

- uncrustify

9e6b937

- further crust

c988cc0

Ported to GTK4 #290

Are you sure you want to change the base?

Ported to GTK4 #290

Uh oh!

Conversation

trigg commented Feb 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ammen99 commented Jun 16, 2025

Uh oh!

ammen99 commented Jun 16, 2025

Uh oh!

ammen99 commented Jun 16, 2025

Uh oh!

ammen99 left a comment

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!

Uh oh!

trigg commented Feb 16, 2025 •

edited

Loading