Use util_clip_triangle() in pan_item_tri_new()

[geeqie.git] / src / fullscreen.h

diff --git a/src/fullscreen.h b/src/fullscreen.h
index abcb76f..764fe8c 100644 (file)
--- a/src/fullscreen.h
+++ b/src/fullscreen.h
@@ -22,10 +22,12 @@
 #ifndef FULLSCREEN_H
 #define FULLSCREEN_H
 
-struct ImageWindow;
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "image-overlay.h"
 
-#define FULL_SCREEN_HIDE_MOUSE_DELAY 3000
-#define FULL_SCREEN_BUSY_MOUSE_DELAY 200
+struct ImageWindow;
 
 struct FullScreenData
 {
@@ -39,17 +41,19 @@ struct FullScreenData
        guint busy_mouse_id; /**< event source id */
 
        gint cursor_state;
+OsdShowFlags osd_flags;
 
        guint saver_block_id; /**< event source id */
 
-       void (*stop_func)(FullScreenData *, gpointer);
+       using StopFunc = void (*)(FullScreenData *, gpointer);
+       StopFunc stop_func;
        gpointer stop_data;
 
        gboolean same_region; /**< the returned region will overlap the current location of widget. */
 };
 
 FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
-                                void (*stop_func)(FullScreenData *, gpointer), gpointer stop_data);
+                                FullScreenData::StopFunc stop_func, gpointer stop_data);
 void fullscreen_stop(FullScreenData *fs);