archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5 file browser

Browse Source 
* bugfix: adding back adding the region on read of old files
* tweak: buttons for increment/decrement file number now have icons and size adjusted to UI_UNIT_X/UI_UNIT_Y
This commit is contained in:
Andrea Weikert
2009-07-12 08:12:22 +00:00
parent ba1082444e
commit 2940384d9a
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenloader/intern/readfile.c
View File

@@ -5677,6 +5677,17 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
/* temporarily hide it */
ar->flag = RGN_FLAG_HIDDEN;
break;
case SPACE_FILE:
ar= MEM_callocN(sizeof(ARegion), "nodetree area for node");
BLI_addtail(lb, ar);
ar->regiontype= RGN_TYPE_CHANNELS;
ar->alignment= RGN_ALIGN_LEFT;
ar= MEM_callocN(sizeof(ARegion), "ui area for file");
BLI_addtail(lb, ar);
ar->regiontype= RGN_TYPE_UI;
ar->alignment= RGN_ALIGN_TOP;
break;
#if 0
case SPACE_BUTS:
/* context UI region */

2
source/blender/editors/interface/interface_handlers.c
View File

@@ -3480,7 +3480,7 @@ static void button_activate_init(bContext *C, ARegion *ar, uiBut *but, uiButtonA
data= MEM_callocN(sizeof(uiHandleButtonData), "uiHandleButtonData");
data->window= CTX_wm_window(C);
data->region= ar;
if( ELEM3(but->type, BUT_CURVE, SEARCH_MENU, TEX) ); // XXX curve is temp
if( ELEM(but->type, BUT_CURVE, SEARCH_MENU) ); // XXX curve is temp
else data->interactive= 1;
data->state = BUTTON_STATE_INIT;

8
source/blender/editors/space_file/file_draw.c
View File

@@ -137,8 +137,8 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
const short line2_y = ar->winy - IMASEL_BUTTONS_HEIGHT - 12;
const short line1_y = line2_y + IMASEL_BUTTONS_HEIGHT/2 + 4;
const short input_minw = 20;
const short btn_h = 21;
const short btn_fn_w = 14;
const short btn_h = UI_UNIT_Y;
const short btn_fn_w = UI_UNIT_X;
const short btn_minw = 80;
const short btn_margin = 20;
const short separator = 4;
@@ -200,13 +200,13 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
/* Filename number increment / decrement buttons. */
if (fnumbuttons) {
uiBlockBeginAlign(block);
but = uiDefButO(block, BUT, "FILE_OT_filenum", 0, "-",
but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMOUT,
min_x + line2_w + separator, line2_y,
btn_fn_w, btn_h,
"Decrement the filename number.");
RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", -1);
but = uiDefButO(block, BUT, "FILE_OT_filenum", 0, "+",
but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMIN,
min_x + line2_w + separator + btn_fn_w, line2_y,
btn_fn_w, btn_h,
"Increment the filename number.");