projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add layout_scale preference, scaling cleanup, rework init bc_resources, init tip_info...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
bcpopupmenu.h
diff --git
a/cinelerra-5.1/guicast/bcpopupmenu.h
b/cinelerra-5.1/guicast/bcpopupmenu.h
index 1d683835c0d2f0020ae5e2904b0e79d22f6942ee..298c6a1d1048fdd24a9c69be42de864a24a73619 100644
(file)
--- a/
cinelerra-5.1/guicast/bcpopupmenu.h
+++ b/
cinelerra-5.1/guicast/bcpopupmenu.h
@@
-35,27
+35,22
@@
class BC_PopupMenu : public BC_SubWindow
{
public:
class BC_PopupMenu : public BC_SubWindow
{
public:
- BC_PopupMenu(int x,
- int y,
- int w,
- const char *text,
- int use_title = 1,
+ BC_PopupMenu(int x, int y, int w, const char *text, int use_title = 1,
// Data for alternative title images
VFrame **data = 0,
// Alternative text margin
int margin = -1);
// Data for alternative title images
VFrame **data = 0,
// Alternative text margin
int margin = -1);
- BC_PopupMenu(int x,
- int y,
- const char *text,
- int use_title = 1,
+ BC_PopupMenu(int x, int y, const char *text, int use_title = 1,
// Data for alternative title images
VFrame **data = 0);
virtual ~BC_PopupMenu();
// Adds popupmenu_margin to width
// Data for alternative title images
VFrame **data = 0);
virtual ~BC_PopupMenu();
// Adds popupmenu_margin to width
- static int calculate_w(int w_argument);
+ static int calculate_w(int margin, int text_width, int use_title);
+ static int calculate_w(int text_width);
static int calculate_h(VFrame **data = 0);
virtual int handle_event() { return 0; };
static int calculate_h(VFrame **data = 0);
virtual int handle_event() { return 0; };
+ virtual int draw_face(int dx, int color);
char* get_text();
int initialize();
int add_item(BC_MenuItem *item);
char* get_text();
int initialize();
int add_item(BC_MenuItem *item);
@@
-63,6
+58,7
@@
public:
int remove_item(BC_MenuItem *item);
int total_items();
BC_MenuItem* get_item(int i);
int remove_item(BC_MenuItem *item);
int total_items();
BC_MenuItem* get_item(int i);
+ int get_margin();
// Set title of menu
void set_text(const char *text);
// Set icon of menu. Disables text.
// Set title of menu
void set_text(const char *text);
// Set icon of menu. Disables text.
@@
-76,8
+72,8
@@
public:
int deactivate_menu();
int focus_out_event();
int repeat_event(int64_t duration);
int deactivate_menu();
int focus_out_event();
int repeat_event(int64_t duration);
- int button_press_event();
- int button_release_event();
+
virtual
int button_press_event();
+
virtual
int button_release_event();
int cursor_leave_event();
int cursor_enter_event();
int cursor_motion_event();
int cursor_leave_event();
int cursor_enter_event();
int cursor_motion_event();