diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-04-12 17:40:29 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-04-12 17:40:29 +0400 |
| commit | 5cb480cef44bc4ec3d191f114622af04bba6285d (patch) | |
| tree | 788654e26024cfacb0431314d716362bd317f4f1 /source/blender/editors/interface/interface_handlers.c | |
| parent | 1fec143198d34dd50a55ef313f2daf55a75cd414 (diff) | |
2.5
Various ui fixes:
- panel drawing now correctly follows scaled view
- made imagewindow buttons using TH_PANEL color back (was too dark)
- click on open/close panel was wrong
- menu items disabling now draws correct
- curve/hsv widgets didn't draw on right locations
- numsliders have nicer interior slider decoration
- new type TOGBUT to enforce old style toggle button (not new type
'option button' with checkmark
- (temp) disabled live updating while using Curve widget, was
too slow to be fun. Needs general solution :)
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 437948c86e8..924d7df8c45 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -564,6 +564,7 @@ static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleBut case TEX: ui_apply_but_TEX(C, but, data); break; + case TOGBUT: case TOG: case TOGR: case ICONTOG: @@ -2658,6 +2659,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) case KEYEVT: retval= ui_do_but_KEYEVT(C, but, data, event); break; + case TOGBUT: case TOG: case TOGR: case ICONTOG: @@ -2972,7 +2974,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; - data->interactive= 1; + data->interactive= but->type==BUT_CURVE?0:1; // XXX temp data->state = BUTTON_STATE_INIT; /* activate button */ |