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

Fixing loose ends:

Browse Source 
- nkey menu for buttonswindow (hex values) couldnt be restored yet, is
  for next release
- replaced Nkey in IpoWindow with Panel, this now displays the buttons
  that were formerly in 'anim buttons' as well; to view the boundbox
  values of all visible curves, and adjust it.
- the new panel also has the 'set speed' option, fixed stuff in it and
  added better errorwarning... still not a very well coded tool!
This commit is contained in:
Ton Roosendaal
2003-10-28 14:20:03 +00:00
parent c6ec4cb984
commit 4bec8ba7d5
13 changed files with 460 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/src/interface.c
View File

@@ -1078,7 +1078,8 @@ static int ui_do_but_TOG(uiBlock *block, uiBut *but)
}
ui_set_but_val(but, (double)lvalue);
if(but->type==ICONTOG) ui_check_but(but);
ui_draw_but(but);
// no frontbuffer draw for this one
if((but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
}
else {
@@ -1088,7 +1089,8 @@ static int ui_do_but_TOG(uiBlock *block, uiBut *but)
if(but->type==TOGN) push= !push;
ui_set_but_val(but, (double)push);
if(but->type==ICONTOG) ui_check_but(but);
ui_draw_but(but);
// no frontbuffer draw for this one
if((but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
}
/* no while loop...this button is used for viewmove */
@@ -2470,7 +2472,7 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent)
}
ui_set_ftf_font(block); // sets just a pointer in ftf lib... the button dont have ftf handles
Mat4CpyMat4(UIwinmat, block->winmat);
uiPanelPush(block); // push matrix; no return without pop!
@@ -2633,7 +2635,7 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent)
if(but->flag & UI_MOUSE_OVER) {
if( (but->flag & UI_ACTIVE)==0) {
but->flag |= UI_ACTIVE;
if(but->type != LABEL /* && but->embossfunc != ui_emboss_N */) ui_draw_but(but);
if(but->type != LABEL && (but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
}
}
/* hilite case 2 */
@@ -2642,7 +2644,7 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent)
/* we dont clear active flag until mouse move, for Menu buttons to remain showing active item when opened */
if (uevent->event==MOUSEY) {
but->flag &= ~UI_ACTIVE;
if(but->type != LABEL /* && but->embossfunc != ui_emboss_N */) ui_draw_but(but);
if(but->type != LABEL && (but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
}
}
else if(but->type==BLOCK || but->type==MENU) { // automatic opens block button (pulldown)