prevent popup deactivation while button_down

[goodguy/history.git] / cinelerra-5.0 / cinelerra / theme.C

diff --git a/cinelerra-5.0/cinelerra/theme.C b/cinelerra-5.0/cinelerra/theme.C
index f3137a250e969e69b2299ffe9d0f57f85caff493..8ace9a7a6a282b89a9a96962ce3c2316fafb44ec 100644 (file)
--- a/cinelerra-5.0/cinelerra/theme.C
+++ b/cinelerra-5.0/cinelerra/theme.C
@@ -94,16 +94,80 @@ Theme::Theme()
        preferences_category_overlap = 0;
 
        loadmode_w = 350;
+       czoom_w = 80;
 
 #include "data/about_png.h"
-       about_bg = new VFrame(about_png);
+       about_bg = new VFramePng(about_png);
 
        pane_color = BLACK;
        drag_pane_color = WHITE;
 
-       
-
-
+       appendasset_data = 0;
+       append_data = 0;
+       asset_append_data = 0;
+       asset_disk_data = 0;
+       asset_index_data = 0;
+       asset_info_data = 0;
+       asset_project_data = 0;
+       browse_data = 0;
+       calibrate_data = 0;
+       camerakeyframe_data = 0;
+       cancel_data = 0;
+       chain_data = 0;
+       channel_bg_data = 0;
+       channel_position_data = 0;
+       delete_all_indexes_data = 0;
+       deletebin_data = 0;
+       delete_data = 0;
+       deletedisk_data = 0;
+       deleteproject_data = 0;
+       detach_data = 0;
+       dntriangle_data = 0;
+
+       edit_data = 0;
+       edithandlein_data = 0;
+       edithandleout_data = 0;
+       extract_data = 0;
+       ffmpeg_toggle = 0;
+       infoasset_data = 0;
+       in_point = 0;
+       insert_data = 0;
+       keyframe_data = 0;
+       label_toggle = 0;
+       lift_data = 0;
+       maskkeyframe_data = 0;
+       modekeyframe_data = 0;
+       movedn_data = 0;
+       moveup_data = 0;
+       newbin_data = 0;
+       no_data = 0;
+       options_data = 0;
+       out_point = 0;
+       over_button = 0;
+       overwrite_data = 0;
+       pankeyframe_data = 0;
+       pasteasset_data = 0;
+       paused_data = 0;
+       picture_data = 0;
+       presentation_data = 0;
+       presentation_loop = 0;
+       presentation_stop = 0;
+       projectorkeyframe_data = 0;
+       redrawindex_data = 0;
+       renamebin_data = 0;
+       reset_data = 0;
+       reverse_data = 0;
+       rewind_data = 0;
+       select_data = 0;
+       shbtn_data = 0;
+       splice_data = 0;
+       start_over_data = 0;
+       statusbar_cancel_data = 0;
+       timebar_view_data = 0;
+       transition_data = 0;
+       uptriangle_data = 0;
+       viewasset_data = 0;
+       vtimebar_bg_data = 0;
 }
 
 
@@ -117,6 +181,7 @@ Theme::~Theme()
        frame_sizes.remove_all_objects();
        sample_rates.remove_all_objects();
        zoom_values.remove_all_objects();
+
        delete about_bg;
 }
 
@@ -251,7 +316,7 @@ void Theme::build_menus()
        frame_rates.append(new BC_ListBoxItem("10"));
        frame_rates.append(new BC_ListBoxItem("12"));
        frame_rates.append(new BC_ListBoxItem("15"));
-       frame_rates.append(new BC_ListBoxItem("23.97"));
+       frame_rates.append(new BC_ListBoxItem("23.976"));
        frame_rates.append(new BC_ListBoxItem("24"));
        frame_rates.append(new BC_ListBoxItem("25"));
        frame_rates.append(new BC_ListBoxItem("29.97"));
@@ -342,7 +407,7 @@ void Theme::build_transport(char *title,
        int third)
 {
        if(!png_overlay) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
        VFrame *data[3];
        data[0] = NEW_VFRAME;
        data[1] = NEW_VFRAME;
@@ -396,7 +461,7 @@ void Theme::build_patches(VFrame** &data,
        int region)
 {
        if(!png_overlay || !bg_data) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
        data = new VFrame*[5];
        data[0] = NEW_VFRAME;
        data[1] = NEW_VFRAME;
@@ -449,7 +514,7 @@ void Theme::build_button(VFrame** &data,
        VFrame *dn_vframe)
 {
        if(!png_overlay) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
 
        if(!up_vframe || !hi_vframe || !dn_vframe) return;
        data = new VFrame*[3];
@@ -472,7 +537,7 @@ void Theme::build_button(VFrame** &data,
        VFrame *at_vframe)
 {
        if(!png_overlay) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
 
        if(!up_vframe || !hi_vframe || !dn_vframe) return;
        data = new VFrame*[4];
@@ -503,7 +568,7 @@ void Theme::build_toggle(VFrame** &data,
                !checked_vframe || 
                !dn_vframe || 
                !checkedhi_vframe) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
        data = new VFrame*[5];
        data[0] = NEW_VFRAME;
        data[1] = NEW_VFRAME;
@@ -524,8 +589,8 @@ void Theme::build_toggle(VFrame** &data,
 void Theme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 {
        mbuttons_x = 0;
-       mbuttons_y = gui->mainmenu->get_h() + 1;
-       mbuttons_w = w;
+       mbuttons_y = gui->menu_h() + 1;
+       mbuttons_w = gui->menu_w();
        mbuttons_h = get_image("mbutton_bg")->get_h();
        mclock_x = 10;
        mclock_y = mbuttons_y - 1 + mbuttons_h + widget_border;
@@ -628,8 +693,6 @@ void Theme::draw_mwindow_bg(MWindowGUI *gui)
 
 void Theme::get_cwindow_sizes(CWindowGUI *gui, int cwindow_controls)
 {
-       czoom_w = 80;
-
        int edit_w = EditPanel::calculate_w(mwindow, 1, 14);
        int transport_w = PlayTransport::get_transport_width(mwindow) + toggle_margin;
        int zoom_w = ZoomPanel::calculate_w(czoom_w);