X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=fc92007026e64f619bb5781b3f09d6eaecbd8b75;hp=13ccda9085d2b6a0f7c3191a2fb8648c6105ff08;hb=6c5258a9791775f706e55c280da75ed6f6ef1720;hpb=24d62aadcd7a6188aff573aaec22f31e3bba4a57

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 13ccda90..fc920070 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -62,6 +62,13 @@
 #define ASSET_VIEW_ICON 1
 #define ASSET_VIEW_MEDIA 2
 #define ASSET_VIEW_MEDIA_MAP 3
+#define ASSET_VIEW_FULL 4
+
+#define AVICON_FULL_PLAY   0
+#define AVICON_MOUSE_OVER  1
+#define AVICON_SRC_TARGET  2
+#define AVICON_NO_PLAY     3
+#define AVICON_PLAY_MODES  4
 
 class AWindowFolderItem : public BC_ListBoxItem
 {
@@ -175,9 +182,11 @@ public:
 			int x, int y, int w, int h);
 	~AssetViewPopup();
 
+	int reposition_window(int x, int y, int w, int h);
 	int button_press_event();
 	int button_release_event();
 	int cursor_motion_event();
+	int keypress_event();
 
 	void draw_vframe(VFrame *frame);
 
@@ -192,10 +201,12 @@ public:
 	AssetVIconThread(AWindowGUI *gui, Preferences *preferences);
 	~AssetVIconThread();
 
-	void set_view_popup(AssetVIcon *v, int draw_mode=-1);
-	ViewPopup *new_view_window();
+	void set_view_popup(AssetVIcon *v, int draw_mode);
+	void set_view_popup(AssetVIcon *v);
+	ViewPopup *new_view_window(ViewPopup *popup);
 	void drawing_started();
 	void drawing_stopped();
+	void close_view_popup();
 
 	AWindowGUI *gui;
 	int draw_mode;
@@ -272,8 +283,9 @@ public:
 	bool protected_pixmap(BC_Pixmap *pixmap);
 	int save_defaults(BC_Hash *defaults);
 	int load_defaults(BC_Hash *defaults);
-	void start_vicon_drawing();
-	void stop_vicon_drawing();
+	int start_vicon_drawing();
+	int stop_vicon_drawing();
+	void close_view_popup();
 	void update_picon(Indexable *indexable);
 	int cycle_assetlist_format();
 
@@ -357,7 +369,7 @@ public:
 
 	AVIconDrawing *avicon_drawing;
 	int avicon_w, avicon_h;
-	int vicon_drawing;
+	int vicon_drawing, play_off;
 	int allow_iconlisting;
 
 // Create custom atoms to be used for async messages between windows
@@ -391,7 +403,8 @@ public:
 	int drag_stop_event();
 	int button_press_event();
 	int column_resize_event();
-	int focus_in_event();
+	int cursor_enter_event();
+	int cursor_leave_event();
 	int focus_out_event();
 	void update_vicon_area();
 	int mouse_over_event(int no);
@@ -566,16 +579,28 @@ public:
 	int idx;
 };
 
-class AVIconDrawing : public BC_Toggle
+class AVIconDrawingItem : public BC_MenuItem
 {
 public:
-	AWindowGUI *agui;
-
+	AVIconDrawingItem(AVIconDrawing *avicon, const char *text, int id);
 	int handle_event();
-	static void calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh);
 
-	AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images);
+	AVIconDrawing *avicon;
+	int id;
+};
+
+class AVIconDrawing : public BC_PopupMenu
+{
+public:
+	AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text);
 	~AVIconDrawing();
+
+	static const char *avicon_names[];
+	void create_objects();
+	int button_press_event();
+	int draw_face(int dx, int color);
+
+	AWindowGUI *agui;
 };