projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add haupauge-1657 dual usb capture support, add deinterlace to recordmonitor, asset...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
bcresources.C
diff --git
a/cinelerra-5.1/guicast/bcresources.C
b/cinelerra-5.1/guicast/bcresources.C
index d44c435abe37fd74500b0867f87f9afb6eaf6734..667192920626c4ab7151d63cf6d3c3376db9c842 100644
(file)
--- a/
cinelerra-5.1/guicast/bcresources.C
+++ b/
cinelerra-5.1/guicast/bcresources.C
@@
-362,12
+362,17
@@
VFrame *BC_Resources::default_vscroll_data[10] = { 0, };
VFrame *BC_Resources::default_hscroll_data[10] = { 0, };
VFrame *BC_Resources::default_icon_img = 0;
VFrame *BC_Resources::default_hscroll_data[10] = { 0, };
VFrame *BC_Resources::default_icon_img = 0;
-BC_Resources::BC_Resources()
+BC_Resources::BC_Resources(
float x_scale, float y_scale
)
{
{
+ BC_WindowBase::resources = this;
synchronous = 0;
vframe_shm = 0;
synchronous = 0;
vframe_shm = 0;
- double default_scale = 1.0; // display_size/1000.;
- char *env = getenv("BC_FONT_DEBUG");
+ if( x_scale <= 0 ) x_scale = 1;
+ if( y_scale <= 0 ) y_scale = x_scale;
+ this->x_scale = x_scale;
+ this->y_scale = y_scale;
+ float default_scale = bmin(x_scale, y_scale);
+ const char *env = getenv("BC_FONT_DEBUG");
font_debug = env ? atoi(env) : 0;
env = getenv("BC_FONT_SCALE");
font_scale = env ? atof(env) : default_scale;
font_debug = env ? atoi(env) : 0;
env = getenv("BC_FONT_SCALE");
font_scale = env ? atof(env) : default_scale;
@@
-732,7
+737,7
@@
new_vframes(10,default_vscroll_data,
listbox_title_overlap = 0;
listbox_title_margin = 0;
listbox_title_color = BLACK;
listbox_title_overlap = 0;
listbox_title_margin = 0;
listbox_title_color = BLACK;
- listbox_title_hotspot =
5
;
+ listbox_title_hotspot =
xS(5)
;
listbox_border1 = DKGREY;
listbox_border2_hi = RED;
listbox_border1 = DKGREY;
listbox_border2_hi = RED;
@@
-748,7
+753,7
@@
new_vframes(10,default_vscroll_data,
pan_data = 0;
pan_text_color = YELLOW;
pan_data = 0;
pan_text_color = YELLOW;
- generic_button_margin =
15
;
+ generic_button_margin =
xS(15)
;
draw_clock_background=1;
use_shm = -1;
draw_clock_background=1;
use_shm = -1;
@@
-800,9
+805,9
@@
new_vframes(10,default_vscroll_data,
popupmenu_images = 0;
popupmenu_images = 0;
- popupmenu_margin =
10
;
+ popupmenu_margin =
xS(10)
;
popupmenu_btnup = 1;
popupmenu_btnup = 1;
- popupmenu_triangle_margin =
10
;
+ popupmenu_triangle_margin =
xS(10)
;
min_menu_w = 0;
menu_title_text = BLACK;
min_menu_w = 0;
menu_title_text = BLACK;
@@
-841,24
+846,24
@@
new_vframes(10,default_vscroll_data,
tooltips_enabled = 1;
textbox_focus_policy = 0;
tooltips_enabled = 1;
textbox_focus_policy = 0;
- filebox_margin =
110
;
- dirbox_margin =
90
;
+ filebox_margin =
yS(110)
;
+ dirbox_margin =
yS(90)
;
filebox_mode = LISTBOX_TEXT;
sprintf(filebox_filter, "*");
filebox_mode = LISTBOX_TEXT;
sprintf(filebox_filter, "*");
- filebox_w =
640
;
- filebox_h =
480
;
+ filebox_w =
xS(640)
;
+ filebox_h =
yS(480)
;
filebox_columntype[0] = FILEBOX_NAME;
filebox_columntype[1] = FILEBOX_SIZE;
filebox_columntype[2] = FILEBOX_DATE;
filebox_columntype[3] = FILEBOX_EXTENSION;
filebox_columntype[0] = FILEBOX_NAME;
filebox_columntype[1] = FILEBOX_SIZE;
filebox_columntype[2] = FILEBOX_DATE;
filebox_columntype[3] = FILEBOX_EXTENSION;
- filebox_columnwidth[0] =
200
;
- filebox_columnwidth[1] =
100
;
- filebox_columnwidth[2] =
100
;
- filebox_columnwidth[3] =
100
;
+ filebox_columnwidth[0] =
xS(200)
;
+ filebox_columnwidth[1] =
xS(100)
;
+ filebox_columnwidth[2] =
xS(100)
;
+ filebox_columnwidth[3] =
xS(100)
;
dirbox_columntype[0] = FILEBOX_NAME;
dirbox_columntype[1] = FILEBOX_DATE;
dirbox_columntype[0] = FILEBOX_NAME;
dirbox_columntype[1] = FILEBOX_DATE;
- dirbox_columnwidth[0] =
200
;
- dirbox_columnwidth[1] =
100
;
+ dirbox_columnwidth[0] =
xS(200)
;
+ dirbox_columnwidth[1] =
xS(100)
;
filebox_text_images = default_filebox_text_images;
filebox_icons_images = default_filebox_icons_images;
filebox_text_images = default_filebox_text_images;
filebox_icons_images = default_filebox_icons_images;
@@
-880,8
+885,8
@@
new_vframes(10,default_vscroll_data,
pot_images = default_pot_images;
pot_offset = 2;
pot_images = default_pot_images;
pot_offset = 2;
- pot_x1 = pot_images[0]->get_w() / 2 -
pot_offset
;
- pot_y1 = pot_images[0]->get_h() / 2 -
pot_offset
;
+ pot_x1 = pot_images[0]->get_w() / 2 -
xS(pot_offset)
;
+ pot_y1 = pot_images[0]->get_h() / 2 -
yS(pot_offset)
;
pot_r = pot_x1;
pot_needle_color = BLACK;
pot_r = pot_x1;
pot_needle_color = BLACK;
@@
-891,7
+896,7
@@
new_vframes(10,default_vscroll_data,
ymeter_images = 0;
meter_font = SMALLFONT_3D;
meter_font_color = RED;
ymeter_images = 0;
meter_font = SMALLFONT_3D;
meter_font_color = RED;
- meter_title_w =
20
;
+ meter_title_w =
xS(20)
;
meter_3d = 1;
medium_7segment = default_medium_7segment;
meter_3d = 1;
medium_7segment = default_medium_7segment;
@@
-907,11
+912,8
@@
new_vframes(10,default_vscroll_data,
use_xft = 0;
#endif
use_xft = 0;
#endif
-
- drag_radius = 10;
+ drag_radius = xS(10);
recursive_resizing = 1;
recursive_resizing = 1;
-
-
}
void BC_Resources::del_vframes(VFrame *vframes[], int n)
}
void BC_Resources::del_vframes(VFrame *vframes[], int n)
@@
-955,6
+957,8
@@
BC_Resources::~BC_Resources()
del_vframes(default_pot_images, 3);
del_vframes(default_progress_images, 2);
del_vframes(default_medium_7segment, 20);
del_vframes(default_pot_images, 3);
del_vframes(default_progress_images, 2);
del_vframes(default_medium_7segment, 20);
+ del_vframes(default_vscroll_data, 10);
+ del_vframes(default_hscroll_data, 10);
if( fontlist ) {
fontlist->remove_all_objects();
delete fontlist;
if( fontlist ) {
fontlist->remove_all_objects();
delete fontlist;