Merge with 'Beep6581/dev'

2023-08-12 18:03:41 +02:00
parent 3120aea7dd bd94fbd6b6
commit d0743ef359
132 changed files with 8909 additions and 3413 deletions
--- a/rtgui/filebrowserentry.h
+++ b/rtgui/filebrowserentry.h
@@ -51,7 +51,6 @@ class FileBrowserEntry final : public ThumbBrowserEntryBase,
 {

    double scale;
-    static bool iconsLoaded;
    bool wasInside;
    ImageAreaToolListener* iatlistener;
    int press_x, press_y, action_x, action_y;
@@ -81,6 +80,7 @@ public:

    FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname);
    ~FileBrowserEntry () override;
+    static void init ();
    void draw (Cairo::RefPtr<Cairo::Context> cc) override;

    void setImageAreaToolListener (ImageAreaToolListener* l)