X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.C;h=cdac6305f8b4d62de4dd807808e5b73c43dff018;hp=667192920626c4ab7151d63cf6d3c3376db9c842;hb=eb9df615719cf3afe2bc08035900e5d3451034e1;hpb=6ff8b339d215bb1c2cef589fd7959aa2e1834105 diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C index 66719292..cdac6305 100644 --- a/cinelerra-5.1/guicast/bcresources.C +++ b/cinelerra-5.1/guicast/bcresources.C @@ -367,6 +367,9 @@ BC_Resources::BC_Resources(float x_scale, float y_scale) BC_WindowBase::resources = this; synchronous = 0; vframe_shm = 0; + use_shm = -1; + shm_reply = 1; + if( x_scale <= 0 ) x_scale = 1; if( y_scale <= 0 ) y_scale = x_scale; this->x_scale = x_scale; @@ -756,9 +759,6 @@ new_vframes(10,default_vscroll_data, generic_button_margin = xS(15); draw_clock_background=1; - use_shm = -1; - shm_reply = 1; - // Initialize bg_color = ORANGE; bg_shadow1 = DKGREY; @@ -785,6 +785,7 @@ new_vframes(10,default_vscroll_data, button_uphighlighted = RED; // upper side when highlighted tumble_data = 0; + tumblepatch_data = 0; tumble_duration = 150; ok_images = default_ok_images; @@ -856,14 +857,14 @@ new_vframes(10,default_vscroll_data, filebox_columntype[1] = FILEBOX_SIZE; filebox_columntype[2] = FILEBOX_DATE; filebox_columntype[3] = FILEBOX_EXTENSION; - filebox_columnwidth[0] = xS(200); + filebox_columnwidth[0] = xS(300); filebox_columnwidth[1] = xS(100); - filebox_columnwidth[2] = xS(100); - filebox_columnwidth[3] = xS(100); + filebox_columnwidth[2] = xS(150); + filebox_columnwidth[3] = xS(49); dirbox_columntype[0] = FILEBOX_NAME; dirbox_columntype[1] = FILEBOX_DATE; - dirbox_columnwidth[0] = xS(200); - dirbox_columnwidth[1] = xS(100); + dirbox_columnwidth[0] = xS(400); + dirbox_columnwidth[1] = xS(199); filebox_text_images = default_filebox_text_images; filebox_icons_images = default_filebox_icons_images; @@ -1856,7 +1857,7 @@ void BC_Resources::encode_to_utf8(char *buffer, int buflen) { if(BC_Resources::locale_utf8) return; char lbuf[buflen]; - encode(encoding, 0, buffer, buflen, lbuf, buflen); + encode(encoding, 0, buffer, -1, lbuf, buflen); strcpy(buffer, lbuf); }