reverted changes made by uncrustify on some comments

Author: AKArien

meson_options.txt

@@ -1,12 +1,2 @@
-option(
-    'pulse',
-    type: 'feature',
-    value: 'auto',
-    description: 'Build pulseaudio volume widget',
-)
-option(
-    'wayland-logout',
-    type: 'boolean',
-    value: true,
-    description: 'Install wayland-logout',
-)
+option('pulse', type: 'feature', value: 'auto', description: 'Build pulseaudio volume widget')
+option('wayland-logout', type: 'boolean', value: 'true', description: 'Install wayland-logout')

src/dock/toplevel-icon.cpp

@@ -1,12 +1,12 @@
 #include <giomm/desktopappinfo.h>
 #include <gtkmm/button.h>
-#include <gtkmm/box.h>
+#include <gtkmm/hvbox.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/image.h>
 
 #include <gdkmm/display.h>
 #include <gdkmm/seat.h>
-#include <gdk/wayland/gdkwayland.h>
+#include <gdk/gdkwayland.h>
 
 #include "dock.hpp"
 #include "toplevel.hpp"
@@ -29,7 +29,6 @@ class WfToplevelIcon::impl
     wl_output *output;
 
     uint32_t state;
-    bool closing = false;
 
     Gtk::Button button;
     Gtk::Image image;
@@ -42,13 +41,17 @@ class WfToplevelIcon::impl
         this->handle = handle;
         this->output = output;
 
-        button.set_child(image);
+        button.add(image);
         button.set_tooltip_text("none");
         button.get_style_context()->add_class("flat");
-        button.get_style_context()->add_class("toplevel-icon");
+        button.show_all();
 
-        button.signal_clicked().connect(
-            sigc::mem_fun(*this, &WfToplevelIcon::impl::on_clicked));
+        button.signal_clicked().connect_notify(
+            sigc::mem_fun(this, &WfToplevelIcon::impl::on_clicked));
+        button.signal_size_allocate().connect_notify(
+            sigc::mem_fun(this, &WfToplevelIcon::impl::on_allocation_changed));
+        button.property_scale_factor().signal_changed()
+            .connect(sigc::mem_fun(this, &WfToplevelIcon::impl::on_scale_update));
 
         auto dock = WfDockApp::get().dock_for_wl_output(output);
         assert(dock); // ToplevelIcon is created only for existing outputs
@@ -57,11 +60,6 @@ class WfToplevelIcon::impl
 
     void on_clicked()
     {
-        if (closing)
-        {
-            return;
-        }
-
         if (!(state & WF_TOPLEVEL_STATE_ACTIVATED))
         {
             auto gseat = Gdk::Display::get_default()->get_default_seat();
@@ -80,13 +78,18 @@ class WfToplevelIcon::impl
         }
     }
 
-    void set_app_id(std::string app_id)
+    void on_allocation_changed(Gtk::Allocation& alloc)
     {
-        if (closing)
-        {
-            return;
-        }
+        send_rectangle_hint();
+    }
+
+    void on_scale_update()
+    {
+        set_app_id(app_id);
+    }
 
+    void set_app_id(std::string app_id)
+    {
         this->app_id = app_id;
         IconProvider::set_image_from_icon(image,
             app_id,
@@ -96,11 +99,6 @@ class WfToplevelIcon::impl
 
     void send_rectangle_hint()
     {
-        if (closing)
-        {
-            return;
-        }
-
         Gtk::Widget *widget = &this->button;
 
         int x = 0, y = 0;
@@ -126,55 +124,21 @@ class WfToplevelIcon::impl
 
     void set_title(std::string title)
     {
-        if (closing)
-        {
-            return;
-        }
-
         button.set_tooltip_text(title);
     }
 
-    void close()
-    {
-        button.get_style_context()->add_class("closing");
-        closing = true;
-    }
-
     void set_state(uint32_t state)
     {
-        if (closing)
-        {
-            return;
-        }
-
         bool was_activated = this->state & WF_TOPLEVEL_STATE_ACTIVATED;
         this->state = state;
         bool is_activated = this->state & WF_TOPLEVEL_STATE_ACTIVATED;
-        bool is_min = state & WF_TOPLEVEL_STATE_MINIMIZED;
-        bool is_max = state & WF_TOPLEVEL_STATE_MAXIMIZED;
-        auto style  = this->button.get_style_context();
+
         if (!was_activated && is_activated)
         {
-            style->remove_class("flat");
+            this->button.get_style_context()->remove_class("flat");
         } else if (was_activated && !is_activated)
         {
-            style->add_class("flat");
-        }
-
-        if (is_min)
-        {
-            style->add_class("minimized");
-        } else
-        {
-            style->remove_class("minimized");
-        }
-
-        if (is_max)
-        {
-            style->add_class("maximized");
-        } else
-        {
-            style->remove_class("maximized");
+            this->button.get_style_context()->add_class("flat");
         }
     }
 
@@ -208,11 +172,6 @@ void WfToplevelIcon::set_state(uint32_t state)
     return pimpl->set_state(state);
 }
 
-void WfToplevelIcon::close()
-{
-    return pimpl->close();
-}
-
 /* Icon loading functions */
 namespace IconProvider
 {
@@ -257,14 +216,20 @@ bool set_custom_icon(Gtk::Image& image, std::string app_id, int size, int scale)
         return false;
     }
 
-    image_set_icon(&image, custom_icons[app_id]);
+    auto pb = load_icon_pixbuf_safe(custom_icons[app_id], size * scale);
+    if (!pb.get())
+    {
+        return false;
+    }
+
+    set_image_pixbuf(image, pb, scale);
     return true;
 }
 
 /* Gio::DesktopAppInfo
  *
- * Usually knowing the app_id, we can get a desktop app info from Gio The filename is either the app_id +
- * ".desktop" or lower_app_id + ".desktop" */
+ * Usually knowing the app_id, we can get a desktop app info from Gio
+ * The filename is either the app_id + ".desktop" or lower_app_id + ".desktop" */
 Icon get_from_desktop_app_info(std::string app_id)
 {
     Glib::RefPtr<Gio::DesktopAppInfo> app_info;
@@ -340,9 +305,8 @@ void set_image_from_icon(Gtk::Image& image,
 
     bool found_icon = false;
 
-    /* Wayfire sends a list of app-id's in space separated format, other compositors send a single app-id, but
-     * in any case this works fine */
-    auto display = image.get_display();
+    /* Wayfire sends a list of app-id's in space separated format, other compositors
+     * send a single app-id, but in any case this works fine */
     while (stream >> app_id)
     {
         /* Try first method: custom icon file provided by the user */
@@ -359,7 +323,7 @@ void set_image_from_icon(Gtk::Image& image,
         if (!icon)
         {
             /* Finally try directly looking up the icon, if it exists */
-            if (Gtk::IconTheme::get_for_display(display)->lookup_icon(app_id, 24))
+            if (Gtk::IconTheme::get_default()->lookup_icon(app_id, 24))
             {
                 icon_name = app_id;
             }
@@ -370,7 +334,7 @@ void set_image_from_icon(Gtk::Image& image,
 
         WfIconLoadOptions options;
         options.user_scale = scale;
-        image_set_icon(&image, icon_name);
+        set_image_icon(image, icon_name, size, options);
 
         /* finally found some icon */
         if (icon_name != "unknown")

src/dock/toplevel-icon.hpp

@@ -12,7 +12,6 @@ class WfToplevelIcon
     void set_app_id(std::string app_id);
     void set_title(std::string title);
     void set_state(uint32_t state);
-    void close();
 
     class impl;
 
@@ -22,8 +21,8 @@ class WfToplevelIcon
 
 namespace IconProvider
 {
-/* Loads custom app_id -> icon file mappings from the section They have the format icon_mapping_<app_id> =
- * <icon file> */
+/* Loads custom app_id -> icon file mappings from the section
+* They have the format icon_mapping_<app_id> = <icon file> */
 void load_custom_icons();
 }
 

src/dock/toplevel.cpp

@@ -35,10 +35,11 @@ class WfToplevel::impl
         /* This catches two edge cases:
          * 1. The dock on the given output simply was closed by the user
          *
-         * 2. The wl_output has been bound multiple times - this happens because gtk will bind each output
-         * once, and then we bind it second time. So the compositor will actually send the output_enter/leave
-         * at least twice, and the one time when we get it with the output resource bound by gtk, we need to
-         * ignore the request */
+         * 2. The wl_output has been bound multiple times - this happens because
+         * gtk will bind each output once, and then we bind it second time. So
+         * the compositor will actually send the output_enter/leave at least
+         * twice, and the one time when we get it with the output resource bound
+         * by gtk, we need to ignore the request */
         if (!dock)
         {
             return;
@@ -85,14 +86,6 @@ class WfToplevel::impl
             icon.second->set_state(state);
         }
     }
-
-    void close()
-    {
-        for (auto& icon : icons)
-        {
-            icon.second->close();
-        }
-    }
 };
 
 
@@ -106,11 +99,6 @@ void WfToplevel::handle_output_leave(wl_output *output)
     pimpl->handle_output_leave(output);
 }
 
-void WfToplevel::close()
-{
-    pimpl->close();
-}
-
 using toplevel_t = zwlr_foreign_toplevel_handle_v1*;
 static void handle_toplevel_title(void *data, toplevel_t, const char *title)
 {
@@ -136,7 +124,8 @@ static void handle_toplevel_output_leave(void *data, toplevel_t, wl_output *outp
     impl->handle_output_leave(output);
 }
 
-/* wl_array_for_each isn't supported in C++, so we have to manually get the data from wl_array, see:
+/* wl_array_for_each isn't supported in C++, so we have to manually
+ * get the data from wl_array, see:
  *
  * https://gitlab.freedesktop.org/wayland/wayland/issues/34 */
 template<class T>

src/dock/toplevel.hpp

@@ -11,15 +11,14 @@ enum WfToplevelState
     WF_TOPLEVEL_STATE_MINIMIZED = (1 << 2),
 };
 
-/* Represents a single opened toplevel window. It displays the window icon on all outputs' docks that it is
- * visible on */
+/* Represents a single opened toplevel window.
+ * It displays the window icon on all outputs' docks that it is visible on */
 class WfToplevel
 {
   public:
     WfToplevel(zwlr_foreign_toplevel_handle_v1 *handle);
     ~WfToplevel();
 
-    void close();
     void handle_output_leave(wl_output *output);
 
     class impl;

src/panel/meson.build

@@ -39,9 +39,6 @@ if libpulse.found()
   deps += [libpulse, libgvc]
 endif
 
-executable(
-  'wf-panel',
-  ['panel.cpp'] + widget_sources,
-  dependencies: deps,
-  install: true,
-)
+executable('wf-panel', ['panel.cpp'] + widget_sources,
+        dependencies: deps,
+        install: true)

src/panel/widgets/clock.cpp

@@ -39,11 +39,12 @@ bool WayfireClock::update_label()
     auto time = Glib::DateTime::create_now_local();
     auto text = time.format((std::string)format);
 
-    /* Sometimes GLib::DateTime will add leading spaces. This results in unevenly balanced padding around the
-     * text, which looks quite bad.
+    /* Sometimes GLib::DateTime will add leading spaces. This results in
+     * unevenly balanced padding around the text, which looks quite bad.
      *
-     * This could be circumvented with the modifiers the user passes to the format string, * but to remove the
-     * requirement that the user does something fancy, we just remove any leading spaces. */
+     * This could be circumvented with the modifiers the user passes to the
+     * format string, * but to remove the requirement that the user does
+     * something fancy, we just remove any leading spaces. */
     int i = 0;
     while (i < (int)text.length() && text[i] == ' ')
     {

src/panel/widgets/launchers.cpp

@@ -132,8 +132,8 @@ launcher_container WayfireLaunchers::get_launchers_from_config()
             }
         }
 
-        /* an entry is a deskop-file entry if the it has the desktop prefix but not the file_icon, file_cmd or
-         * file_label prefix */
+        /* an entry is a deskop-file entry if the it has the desktop prefix
+         * but not the file_icon, file_cmd or file_label prefix */
         if (begins_with(opt->get_name(), desktop_prefix) &&
             !begins_with(opt->get_name(), file_icon_prefix) &&
             !begins_with(opt->get_name(), file_cmd_prefix) &&

src/panel/widgets/menu.cpp

@@ -286,8 +286,8 @@ void WayfireMenu::load_menu_item(AppInfo app_info)
 
     loaded_apps.insert({name, exec});
 
-    /* Check if this has a 'OnlyShownIn' for a different desktop env If so, we throw it in a pile at the
-     * bottom just to be safe */
+    /* Check if this has a 'OnlyShownIn' for a different desktop env
+     * If so, we throw it in a pile at the bottom just to be safe */
     if (!app_info->should_show())
     {
         add_category_app("Hidden", app_info);
@@ -802,9 +802,9 @@ static void app_info_changed(GAppInfoMonitor *gappinfomonitor, gpointer user_dat
 
 void WayfireMenu::init(Gtk::Box *container)
 {
-    /* https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry Using the
-     * 'Main' categories, with names and icons assigned Any Categories in .desktop files that are not in this
-     * list are ignored */
+    /* https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry
+     * Using the 'Main' categories, with names and icons assigned
+     * Any Categories in .desktop files that are not in this list are ignored */
     category_list["All"]     = std::make_unique<WfMenuCategory>("All", "applications-other");
     category_list["Network"] = std::make_unique<WfMenuCategory>("Internet",
         "applications-internet");

src/panel/widgets/menu.hpp

@@ -153,8 +153,8 @@ class WayfireMenu : public WayfireWidget
     void on_search_changed();
     void on_popover_shown();
 
-    /* loaded_apps is a list of the already-opened applications + their execs, so that we don't show duplicate
-     * entries */
+    /* loaded_apps is a list of the already-opened applications + their execs,
+     * so that we don't show duplicate entries */
     std::set<std::pair<std::string, std::string>> loaded_apps;
     std::unordered_map<std::string, std::unique_ptr<WfMenuCategory>> category_list;
     std::string category = "All";