X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=99db0753ceaa9e0f7eec56c016a9c73e68b574d3;hp=b936647fd7b572ee874c9ac32ad4688eec53cf33;hb=debf38f78ae5ce154f54183b1638278bf8a24736;hpb=2292a9b260b7c5f0ee85280823ef760910ace931

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index b936647f..99db0753 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -53,8 +53,13 @@
 #define SELECT_USED 1
 #define SELECT_UNUSED 2
 #define SELECT_NONE 3
+
+// in percent view_h
 #define VIEW_POPUP_BAR_H 15
 
+#define ASSET_DRAW_IMAGE 0
+#define ASSET_DRAW_MEDIA_MAP 1
+
 class AWindowFolderItem : public BC_ListBoxItem
 {
 public:
@@ -155,13 +160,42 @@ public:
 	void load_audio();
 	void start_audio();
 	void stop_audio();
-	int popup_button_press(int x, int y);
-	int popup_cursor_motion(int x, int y);
 
 	AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length);
 	~AssetVIcon();
 };
 
+class AssetViewPopup : public ViewPopup
+{
+public:
+	AssetViewPopup(VIconThread *vt, int draw_mode,
+		VFrame *frame, int x, int y, int w, int h);
+	~AssetViewPopup();
+
+	int button_press_event();
+	int button_release_event();
+	int cursor_motion_event();
+
+	void draw_vframe(VFrame *frame);
+
+	int bar_h;
+	int draw_mode;
+	int dragging;
+};
+
+class AssetVIconThread : public VIconThread
+{
+public:
+	AssetVIconThread(AWindowAssets *asset_list);
+	~AssetVIconThread();
+
+	void set_view_popup(AssetVIcon *vicon, int draw_mode=-1);
+	ViewPopup *new_view_window(VFrame *frame);
+
+	int draw_mode;
+};
+
+
 class AWindowRemovePlugin;
 
 class AWindowRemovePluginGUI : public BC_Window {
@@ -307,14 +341,15 @@ public:
 	AddTools *add_tools;
 // Temporary for reading picons from files
 	VFrame *temp_picon;
-	VIconThread *vicon_thread;
+	AssetVIconThread *vicon_thread;
 	AssetVIconAudio *vicon_audio;
 
 	int64_t plugin_visibility;
 	AWindowRemovePlugin *remove_plugin;
 
 	AVIconDrawing *avicon_drawing;
-	int avicon_w, avicon_h, vicon_drawing;
+	int avicon_w, avicon_h;
+	int vicon_drawing;
 	int allow_iconlisting;
 
 // Create custom atoms to be used for async messages between windows
@@ -350,12 +385,8 @@ public:
 	int column_resize_event();
 	int focus_in_event();
 	int focus_out_event();
-	int cursor_enter_event();
-	int cursor_leave_event();
 	void update_vicon_area();
 	int mouse_over_event(int no);
-	static VIconDrawVFrame draw_vframe;
-	VIconDrawVFrame *draw_func;
 
 	MWindow *mwindow;
 	AWindowGUI *gui;