GTK4

lib/IndicatorManager.vala

@@ -143,6 +143,7 @@ public class Wingpanel.IndicatorManager : GLib.Object {
     }
 
     private void load (string path) {
+        warning ("LOAD: %s", path);
         if (!Module.supported ()) {
             error ("Wingpanel is not supported by this system!");
         }
@@ -172,6 +173,7 @@ public class Wingpanel.IndicatorManager : GLib.Object {
         void* function;
 
         if (!module.symbol ("get_indicator", out function)) {
+            warning ("SYMBOL NOT FOUND");
             return;
         }
 
@@ -186,9 +188,10 @@ public class Wingpanel.IndicatorManager : GLib.Object {
 
         if (indicator == null) {
             debug ("Unknown plugin type for %s or indicator is hidden on this server!", path);
-
+            warning ("INDICATOR IS NULL");
             return;
         }
+        warning ("REGISTER");
 
         module.make_resident ();
         register_indicator (path, indicator);
@@ -327,7 +330,7 @@ public class Wingpanel.IndicatorManager : GLib.Object {
      * @param indicator The indicator.
      */
     public void register_indicator (string path, Wingpanel.Indicator indicator) {
-        debug ("%s registered", indicator.code_name);
+        warning ("%s registered", indicator.code_name);
 
         var deregister_map = new Gee.HashMap<string, Wingpanel.Indicator> ();
         indicators.@foreach ((entry) => {
@@ -347,6 +350,7 @@ public class Wingpanel.IndicatorManager : GLib.Object {
         indicators.@set (path, indicator);
 
         indicator_added (indicator);
+        warning ("INDICATOR ADDED");
     }
 
     /**

lib/meson.build

@@ -1,4 +1,4 @@
-indicators_dir = join_paths(get_option('prefix'), get_option('libdir'), 'wingpanel')
+indicators_dir = join_paths(get_option('prefix'), get_option('libdir'), 'wingpanel-4')
 
 config_vapi = meson.get_compiler('vala').find_library('config', dirs: meson.current_source_dir())
 
@@ -19,13 +19,11 @@ libwingpanel_deps = [
     gtk_dep,
 ]
 
-libwingpanel_lib = library('wingpanel',
+libwingpanel_lib = library('wingpanel-4',
     'Indicator.vala',
     'IndicatorManager.vala',
-    'Widgets/Container.vala',
-    'Widgets/OverlayIcon.vala',
-    'Widgets/Separator.vala',
-    'Widgets/Switch.vala',
+    # 'Widgets/Container.vala',
+    # 'Widgets/OverlayIcon.vala',
     config_header,
     dependencies: [libwingpanel_deps, config_vapi],
     vala_header: 'wingpanel.h',
@@ -37,7 +35,7 @@ libwingpanel_lib = library('wingpanel',
 pkg.generate(
     libwingpanel_lib,
     filebase: 'wingpanel',
-    name: 'Wingpanel',
+    name: 'Wingpanel-4',
     description: 'Wingpanel Indicators API',
     version: meson.project_version(),
     subdirs: 'wingpanel',

lib/wingpanel.deps

@@ -1,4 +1,4 @@
 glib-2.0
 gee-0.8
 gmodule-2.0
-gtk+-3.0
+gtk4

meson.build

@@ -28,13 +28,13 @@ glib_dep = dependency('glib-2.0', version: '>=2.32')
 gio_dep = dependency('gio-2.0')
 gio_unix_dep = dependency('gio-unix-2.0')
 gmodule_dep = dependency('gmodule-2.0')
-gdk_wl_dep = dependency('gdk-wayland-3.0')
+gdk_wl_dep = dependency('gtk4-wayland')
 # GDK X11 dep is for detecting whether we're on Wayland or not ONLY, we don't actually have
 # a hard X11 dependency here
-gdk_x11_dep = dependency('gdk-x11-3.0')
-gtk_dep = dependency('gtk+-3.0', version: '>=3.10')
+# gdk_x11_dep = dependency('gdk-x11-3.0')
+gtk_dep = dependency('gtk4')
 gee_dep = dependency('gee-0.8')
-granite_dep = dependency('granite', version: '>=5.4.0')
+granite_dep = dependency('granite-7')
 posix_dep = meson.get_compiler('vala').find_library('posix')
 wl_client_dep = dependency('wayland-client')
 
@@ -46,6 +46,7 @@ subdir('src')
 subdir('wingpanel-interface')
 if get_option('example')
     subdir('sample')
+    subdir('sample copy')
 endif
 subdir('po')
 vapigen = find_program('vapigen', required: false)

sample/SampleIndicator.vala

@@ -47,16 +47,22 @@ public class Sample.Indicator : Wingpanel.Indicator {
 
         /* Create a new composited icon */
         display_widget = new Gtk.Overlay ();
-        display_widget.add (main_image);
+        display_widget.set_child (main_image);
         display_widget.add_overlay (overlay_image);
 
+        var scroll = new Gtk.EventControllerScroll (NONE);
+        main_image.add_controller (scroll);
+        scroll.scroll.connect (() => {
+            warning ("SCROLL");
+        });
+
         var separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL) {
             margin_top = 3,
             margin_bottom = 3
         };
 
-        var hide_button = new Gtk.ModelButton ();
-        hide_button.text = _("Hide me!");
+        var hide_button = new Gtk.Button ();
+        hide_button.label = _("Hide me!");
 
         var compositing_switch = new Granite.SwitchModelButton (_("Composited Icon"));
 

src/Application.vala

@@ -117,7 +117,7 @@ public class Wingpanel.Application : Gtk.Application {
         base.startup ();
 
         panel_window = new PanelWindow (this);
-        panel_window.show_all ();
+        panel_window.present ();
 
         register_actions ();
     }