From: Arkadiy Illarionov <qarkai@gmail.com>
Date: Fri, 12 Apr 2024 19:23:18 +0000 (+0300)
Subject: Move some types and constants from pan-types to specific modules
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=b7a3426d7badff8ef228c1015d9bbd6c383c81d9

Move some types and constants from pan-types to specific modules
---

diff --git a/src/pan-view/pan-timeline.cc b/src/pan-view/pan-timeline.cc
index e41a34d7..f0a1e08b 100644
--- a/src/pan-view/pan-timeline.cc
+++ b/src/pan-view/pan-timeline.cc
@@ -31,6 +31,13 @@
 #include "pan-view.h"
 #include "typedefs.h"
 
+namespace
+{
+
+constexpr gint PAN_GROUP_MAX = 16;
+
+} // namespace
+
 void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height)
 {
 	GList *list;
diff --git a/src/pan-view/pan-types.h b/src/pan-view/pan-types.h
index e50847ad..066ebada 100644
--- a/src/pan-view/pan-types.h
+++ b/src/pan-view/pan-types.h
@@ -29,6 +29,8 @@
 
 struct FullScreenData;
 struct ImageWindow;
+struct PanViewFilterUi;
+struct PanViewSearchUi;
 struct ThumbLoader;
 
 /* thumbnail sizes and spacing */
@@ -65,10 +67,6 @@ struct ThumbLoader;
 #define PAN_TEXT_COLOR 0, 0, 0
 
 
-#define PAN_GROUP_MAX 16
-
-
-
 enum PanLayoutType {
 	PAN_LAYOUT_TIMELINE = 0,
 	PAN_LAYOUT_CALENDAR,
@@ -155,21 +153,6 @@ struct PanItem {
 	gboolean queued;
 };
 
-struct PanViewSearchUi
-{
-	GtkWidget *search_box;
-	GtkWidget *search_entry;
-	GtkWidget *search_label;
-	GtkWidget *search_button;
-	GtkWidget *search_button_arrow;
-};
-
-/**
- * @struct PanViewFilterUi
- * Defined in pan-view-filter.h
- */
-struct PanViewFilterUi;
-
 struct PanWindow
 {
 	GtkWidget *window;
@@ -225,14 +208,6 @@ struct PanWindow
 	gint idle_id;
 };
 
-struct PanGrid {
-	gint x;
-	gint y;
-	gint w;
-	gint h;
-	GList *list;
-};
-
 struct PanCacheData {
 	FileData *fd;
 	CacheData *cd;
diff --git a/src/pan-view/pan-view-search.h b/src/pan-view/pan-view-search.h
index 6adc890f..ecc1064f 100644
--- a/src/pan-view/pan-view-search.h
+++ b/src/pan-view/pan-view-search.h
@@ -25,9 +25,17 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-struct PanViewSearchUi;
 struct PanWindow;
 
+struct PanViewSearchUi
+{
+	GtkWidget *search_box;
+	GtkWidget *search_entry;
+	GtkWidget *search_label;
+	GtkWidget *search_button;
+	GtkWidget *search_button_arrow;
+};
+
 void pan_search_toggle_visible(PanWindow *pw, gboolean enable);
 void pan_search_activate(PanWindow *pw);
 void pan_search_activate_cb(const gchar *text, gpointer data);
diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index d6ce6f3c..e1d68867 100644
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -73,6 +73,14 @@
 namespace
 {
 
+struct PanGrid {
+	gint x;
+	gint y;
+	gint w;
+	gint h;
+	GList *list;
+};
+
 constexpr gint PAN_WINDOW_DEFAULT_WIDTH = 720;
 constexpr gint PAN_WINDOW_DEFAULT_HEIGHT = 500;