2002-10-12 11:37:38 +00:00
|
|
|
/**
|
|
|
|
|
* $Id$
|
|
|
|
|
*
|
|
|
|
|
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version. The Blender
|
|
|
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
|
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
|
|
|
* about this.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
*
|
|
|
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* The Original Code is: all of this file.
|
|
|
|
|
*
|
|
|
|
|
* Contributor(s): none yet.
|
|
|
|
|
*
|
|
|
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
|
|
|
*/
|
|
|
|
|
|
2003-07-22 19:49:47 +00:00
|
|
|
/*
|
|
|
|
|
a full doc with API notes can be found in bf-blender/blender/doc/interface_API.txt
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
#include <math.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
2003-10-14 10:45:35 +00:00
|
|
|
#include <ctype.h>
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2002-11-25 12:02:15 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
#ifndef WIN32
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#else
|
|
|
|
|
#include <io.h>
|
|
|
|
|
#include "BLI_winstuff.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
|
|
#include "PIL_time.h"
|
|
|
|
|
|
2003-07-15 14:43:18 +00:00
|
|
|
#include "BMF_Api.h"
|
2003-07-14 13:48:44 +00:00
|
|
|
#include "BIF_language.h"
|
2003-05-03 12:17:11 +00:00
|
|
|
#ifdef INTERNATIONAL
|
2003-07-16 04:53:15 +00:00
|
|
|
#include "FTF_Api.h"
|
2003-07-14 13:48:44 +00:00
|
|
|
#endif // INTERNATIONAL
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
|
|
|
|
#include "BLI_arithb.h"
|
|
|
|
|
|
|
|
|
|
#include "DNA_screen_types.h"
|
2003-10-04 20:35:50 +00:00
|
|
|
#include "DNA_space_types.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "DNA_userdef_types.h"
|
2003-10-06 10:33:01 +00:00
|
|
|
#include "DNA_vec_types.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
#include "BKE_blender.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "BKE_utildefines.h"
|
|
|
|
|
#include "BKE_global.h"
|
|
|
|
|
|
|
|
|
|
#include "BIF_gl.h"
|
|
|
|
|
#include "BIF_graphics.h"
|
|
|
|
|
#include "BIF_keyval.h"
|
|
|
|
|
#include "BIF_mainqueue.h"
|
|
|
|
|
#include "BIF_resources.h"
|
|
|
|
|
#include "BIF_screen.h"
|
|
|
|
|
#include "BIF_toolbox.h"
|
|
|
|
|
#include "BIF_mywindow.h"
|
|
|
|
|
#include "BIF_space.h"
|
|
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
#include "BIF_interface.h"
|
2003-10-04 20:35:50 +00:00
|
|
|
#include "BIF_butspace.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
#include "BSE_view.h"
|
|
|
|
|
|
|
|
|
|
#include "mydevice.h"
|
|
|
|
|
#include "interface.h"
|
|
|
|
|
#include "blendef.h"
|
|
|
|
|
|
|
|
|
|
/* naming conventions:
|
|
|
|
|
*
|
|
|
|
|
* uiBlahBlah() external function
|
|
|
|
|
* ui_blah_blah() internal function
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/***/
|
2003-07-07 15:50:44 +00:00
|
|
|
/* ************ GLOBALS ************* */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-15 19:23:54 +00:00
|
|
|
float UIwinmat[4][4];
|
2002-10-12 11:37:38 +00:00
|
|
|
static int UIlock= 0, UIafterval;
|
|
|
|
|
static char *UIlockstr=NULL;
|
|
|
|
|
static void (*UIafterfunc)(void *arg, int event);
|
|
|
|
|
static void *UIafterfunc_arg;
|
|
|
|
|
|
2003-07-07 15:50:44 +00:00
|
|
|
static uiFont UIfont[UI_ARRAY]; // no init needed
|
2003-11-30 19:18:08 +00:00
|
|
|
uiBut *UIbuttip;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
/* ************* PROTOTYPES ***************** */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
static void ui_set_but_val(uiBut *but, double value);
|
2003-10-23 22:20:19 +00:00
|
|
|
static void ui_set_ftf_font(uiBlock *block);
|
2003-10-04 20:35:50 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* ****************************** */
|
|
|
|
|
|
|
|
|
|
static int uibut_contains_pt(uiBut *but, short *pt)
|
|
|
|
|
{
|
|
|
|
|
return ((but->x1<pt[0] && but->x2>=pt[0]) &&
|
|
|
|
|
(but->y1<pt[1] && but->y2>=pt[1]));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void uibut_do_func(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
if (but->func) {
|
|
|
|
|
but->func(but->func_arg1, but->func_arg2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
/* ************* window matrix ************** */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
|
2003-10-16 00:17:24 +00:00
|
|
|
void ui_graphics_to_window(int win, float *x, float *y) /* for rectwrite */
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
float gx, gy;
|
|
|
|
|
int sx, sy;
|
|
|
|
|
int getsizex, getsizey;
|
|
|
|
|
|
|
|
|
|
bwin_getsize(win, &getsizex, &getsizey);
|
|
|
|
|
bwin_getsuborigin(win, &sx, &sy);
|
|
|
|
|
|
|
|
|
|
gx= *x;
|
|
|
|
|
gy= *y;
|
|
|
|
|
*x= sx + getsizex*(0.5+ 0.5*(gx*UIwinmat[0][0]+ gy*UIwinmat[1][0]+ UIwinmat[3][0]));
|
|
|
|
|
*y= sy + getsizey*(0.5+ 0.5*(gx*UIwinmat[0][1]+ gy*UIwinmat[1][1]+ UIwinmat[3][1]));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-10-16 00:17:24 +00:00
|
|
|
void ui_window_to_graphics(int win, float *x, float *y) /* for mouse cursor */
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
float a, b, c, d, e, f, px, py;
|
|
|
|
|
int getsizex, getsizey;
|
|
|
|
|
|
|
|
|
|
bwin_getsize(win, &getsizex, &getsizey);
|
|
|
|
|
|
|
|
|
|
a= .5*getsizex*UIwinmat[0][0];
|
|
|
|
|
b= .5*getsizex*UIwinmat[1][0];
|
|
|
|
|
c= .5*getsizex*(1.0+UIwinmat[3][0]);
|
|
|
|
|
|
|
|
|
|
d= .5*getsizey*UIwinmat[0][1];
|
|
|
|
|
e= .5*getsizey*UIwinmat[1][1];
|
|
|
|
|
f= .5*getsizey*(1.0+UIwinmat[3][1]);
|
|
|
|
|
|
|
|
|
|
px= *x;
|
|
|
|
|
py= *y;
|
|
|
|
|
|
|
|
|
|
*y= (a*(py-f) + d*(c-px))/(a*e-d*b);
|
|
|
|
|
*x= (px- b*(*y)- c)/a;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
/* ************* SAVE UNDER ************ */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
typedef struct {
|
|
|
|
|
short x, y, sx, sy, oldwin;
|
|
|
|
|
int oldcursor;
|
|
|
|
|
unsigned int *rect;
|
|
|
|
|
} uiSaveUnder;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
static void ui_paste_under(uiSaveUnder *su)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
|
|
if(su) {
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
glDisable(GL_DITHER);
|
|
|
|
|
glRasterPos2f( su->x-0.5, su->y-0.5 );
|
|
|
|
|
glDrawPixels(su->sx, su->sy, GL_RGBA, GL_UNSIGNED_BYTE, su->rect);
|
|
|
|
|
glEnable(GL_DITHER);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
if(su->oldwin) {
|
|
|
|
|
mywinset(su->oldwin);
|
|
|
|
|
if (su->oldcursor) {
|
|
|
|
|
set_cursor(su->oldcursor);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
|
|
|
|
|
MEM_freeN(su->rect);
|
|
|
|
|
MEM_freeN(su);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2003-10-04 20:35:50 +00:00
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
static uiSaveUnder *ui_save_under(int x, int y, int sx, int sy)
|
2003-10-04 20:35:50 +00:00
|
|
|
{
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
uiSaveUnder *su=NULL;
|
2003-10-04 20:35:50 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
if(sx>1 && sy>1) {
|
|
|
|
|
|
|
|
|
|
su= MEM_callocN(sizeof(uiSaveUnder), "save under");
|
|
|
|
|
|
|
|
|
|
su->rect= MEM_mallocN(sx*sy*4, "temp_frontbuffer_image");
|
|
|
|
|
su->x= x;
|
|
|
|
|
su->y= y;
|
|
|
|
|
su->sx= sx;
|
|
|
|
|
su->sy= sy;
|
|
|
|
|
glReadPixels(x, y, sx, sy, GL_RGBA, GL_UNSIGNED_BYTE, su->rect);
|
2003-10-04 20:35:50 +00:00
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
return su;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
|
|
|
|
|
static uiSaveUnder *ui_bgnpupdraw(int startx, int starty, int endx, int endy, int cursor)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
uiSaveUnder *su;
|
|
|
|
|
short oldwin;
|
|
|
|
|
|
|
|
|
|
#if defined(__sgi) || defined(__sun)
|
|
|
|
|
/* this is a dirty patch: gets sometimes the backbuffer */
|
|
|
|
|
my_get_frontbuffer_image(0, 0, 1, 1);
|
|
|
|
|
my_put_frontbuffer_image();
|
|
|
|
|
#endif
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
oldwin= mywinget();
|
|
|
|
|
|
|
|
|
|
mywinset(G.curscreen->mainwin);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
/* tinsy bit larger, 1 pixel on the edge */
|
2003-07-07 15:50:44 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
glReadBuffer(GL_FRONT);
|
|
|
|
|
glDrawBuffer(GL_FRONT);
|
|
|
|
|
|
|
|
|
|
/* for geforce and other cards */
|
|
|
|
|
glFinish();
|
2003-07-07 15:50:44 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
su= ui_save_under(startx-1, starty-1, endx-startx+2, endy-starty+6);
|
|
|
|
|
if(su) su->oldwin= oldwin;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
if(su && cursor) {
|
|
|
|
|
su->oldcursor= get_cursor();
|
|
|
|
|
set_cursor(CURSOR_STD);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return su;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
static void ui_endpupdraw(uiSaveUnder *su)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
|
|
|
|
|
/* for geforce and other cards */
|
|
|
|
|
|
|
|
|
|
glReadBuffer(GL_FRONT);
|
|
|
|
|
glDrawBuffer(GL_FRONT);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
glFinish();
|
|
|
|
|
|
|
|
|
|
if(su) {
|
|
|
|
|
ui_paste_under(su);
|
|
|
|
|
}
|
|
|
|
|
glReadBuffer(GL_BACK);
|
|
|
|
|
glDrawBuffer(GL_BACK);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ******************* block calc ************************* */
|
|
|
|
|
|
2003-05-07 03:00:11 +00:00
|
|
|
void uiTextBoundsBlock(uiBlock *block, int addval)
|
|
|
|
|
{
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
int i = 0, j;
|
|
|
|
|
|
|
|
|
|
bt= block->buttons.first;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if(bt->type!=SEPR) {
|
2004-01-13 14:50:45 +00:00
|
|
|
j= BIF_GetStringWidth(bt->font, bt->drawstr, (U.transopts & USER_TR_BUTTONS));
|
2003-07-14 13:48:44 +00:00
|
|
|
|
|
|
|
|
if(j > i) i = j;
|
2003-05-07 03:00:11 +00:00
|
|
|
}
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bt= block->buttons.first;
|
|
|
|
|
while(bt) {
|
|
|
|
|
bt->x2 = i + addval;
|
2003-10-25 22:29:24 +00:00
|
|
|
ui_check_but(bt); // clips text again
|
2003-05-07 03:00:11 +00:00
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
void uiBoundsBlock(uiBlock *block, int addval)
|
|
|
|
|
{
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
if(block->buttons.first==NULL) {
|
|
|
|
|
if(block->panel) {
|
|
|
|
|
block->minx= 0.0; block->maxx= block->panel->sizex;
|
|
|
|
|
block->miny= 0.0; block->maxy= block->panel->sizey;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
block->minx= block->miny= 10000;
|
|
|
|
|
block->maxx= block->maxy= -10000;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
bt= block->buttons.first;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if(bt->x1 < block->minx) block->minx= bt->x1;
|
|
|
|
|
if(bt->y1 < block->miny) block->miny= bt->y1;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
if(bt->x2 > block->maxx) block->maxx= bt->x2;
|
|
|
|
|
if(bt->y2 > block->maxy) block->maxy= bt->y2;
|
|
|
|
|
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
block->minx -= addval;
|
|
|
|
|
block->miny -= addval;
|
|
|
|
|
block->maxx += addval;
|
|
|
|
|
block->maxy += addval;
|
|
|
|
|
}
|
2003-11-12 21:23:37 +00:00
|
|
|
|
|
|
|
|
block->safety.xmin= block->minx-40;
|
|
|
|
|
block->safety.ymin= block->miny-40;
|
|
|
|
|
block->safety.xmax= block->maxx+40;
|
|
|
|
|
block->safety.ymax= block->maxy+40;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_positionblock(uiBlock *block, uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
/* position block relative to but */
|
|
|
|
|
uiBut *bt;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
rctf butrct;
|
|
|
|
|
int xsize, ysize, xof=0, yof=0, centre;
|
|
|
|
|
short dir1= 0, dir2=0;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
/* first transform to screen coords, assuming matrix is stil OK */
|
|
|
|
|
/* the UIwinmat is in panelspace */
|
|
|
|
|
|
|
|
|
|
butrct.xmin= but->x1; butrct.xmax= but->x2;
|
|
|
|
|
butrct.ymin= but->y1; butrct.ymax= but->y2;
|
|
|
|
|
|
|
|
|
|
ui_graphics_to_window(block->win, &butrct.xmin, &butrct.ymin);
|
|
|
|
|
ui_graphics_to_window(block->win, &butrct.xmax, &butrct.ymax);
|
|
|
|
|
block->parentrct= butrct; // will use that for pulldowns later
|
|
|
|
|
|
|
|
|
|
/* calc block rect */
|
2002-10-12 11:37:38 +00:00
|
|
|
block->minx= block->miny= 10000;
|
|
|
|
|
block->maxx= block->maxy= -10000;
|
|
|
|
|
|
|
|
|
|
bt= block->buttons.first;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if(bt->x1 < block->minx) block->minx= bt->x1;
|
|
|
|
|
if(bt->y1 < block->miny) block->miny= bt->y1;
|
|
|
|
|
|
|
|
|
|
if(bt->x2 > block->maxx) block->maxx= bt->x2;
|
|
|
|
|
if(bt->y2 > block->maxy) block->maxy= bt->y2;
|
|
|
|
|
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
ui_graphics_to_window(block->win, &block->minx, &block->miny);
|
|
|
|
|
ui_graphics_to_window(block->win, &block->maxx, &block->maxy);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
block->minx-= 2.0; block->miny-= 2.0;
|
|
|
|
|
block->maxx+= 2.0; block->maxy+= 2.0;
|
|
|
|
|
|
2003-10-07 12:49:39 +00:00
|
|
|
xsize= block->maxx - block->minx+4; // 4 for shadow
|
|
|
|
|
ysize= block->maxy - block->miny+4;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if(but) {
|
|
|
|
|
short left=0, right=0, top=0, down=0;
|
|
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if(block->direction & UI_CENTRE) centre= ysize/2;
|
|
|
|
|
else centre= 0;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
if( butrct.xmin-xsize > 0.0) left= 1;
|
|
|
|
|
if( butrct.xmax+xsize < G.curscreen->sizex) right= 1;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if( butrct.ymin-ysize+centre > 0.0) down= 1;
|
|
|
|
|
if( butrct.ymax+ysize-centre < G.curscreen->sizey) top= 1;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
dir1= block->direction & UI_DIRECTION;
|
|
|
|
|
|
|
|
|
|
/* secundary directions */
|
|
|
|
|
if(dir1 & (UI_TOP|UI_DOWN)) {
|
|
|
|
|
if(dir1 & UI_LEFT) dir2= UI_LEFT;
|
|
|
|
|
else if(dir1 & UI_RIGHT) dir2= UI_RIGHT;
|
|
|
|
|
dir1 &= (UI_TOP|UI_DOWN);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(dir2==0) if(dir1==UI_LEFT || dir1==UI_RIGHT) dir2= UI_DOWN;
|
|
|
|
|
if(dir2==0) if(dir1==UI_TOP || dir1==UI_DOWN) dir2= UI_LEFT;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-07 12:49:39 +00:00
|
|
|
/* no space at all? dont change */
|
|
|
|
|
if(left || right) {
|
|
|
|
|
if(dir1==UI_LEFT && left==0) dir1= UI_RIGHT;
|
|
|
|
|
if(dir1==UI_RIGHT && right==0) dir1= UI_LEFT;
|
2002-10-12 11:37:38 +00:00
|
|
|
/* this is aligning, not append! */
|
2003-10-07 12:49:39 +00:00
|
|
|
if(dir2==UI_LEFT && right==0) dir2= UI_RIGHT;
|
|
|
|
|
if(dir2==UI_RIGHT && left==0) dir2= UI_LEFT;
|
|
|
|
|
}
|
|
|
|
|
if(down || top) {
|
|
|
|
|
if(dir1==UI_TOP && top==0) dir1= UI_DOWN;
|
|
|
|
|
if(dir1==UI_DOWN && down==0) dir1= UI_TOP;
|
|
|
|
|
if(dir2==UI_TOP && top==0) dir2= UI_DOWN;
|
|
|
|
|
if(dir2==UI_DOWN && down==0) dir2= UI_TOP;
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
if(dir1==UI_LEFT) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
xof= butrct.xmin - block->maxx;
|
|
|
|
|
if(dir2==UI_TOP) yof= butrct.ymin - block->miny-centre;
|
|
|
|
|
else yof= butrct.ymax - block->maxy+centre;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else if(dir1==UI_RIGHT) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
xof= butrct.xmax - block->minx;
|
|
|
|
|
if(dir2==UI_TOP) yof= butrct.ymin - block->miny-centre;
|
|
|
|
|
else yof= butrct.ymax - block->maxy+centre;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else if(dir1==UI_TOP) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
yof= butrct.ymax - block->miny-1;
|
|
|
|
|
if(dir2==UI_RIGHT) xof= butrct.xmax - block->maxx;
|
|
|
|
|
else xof= butrct.xmin - block->minx;
|
|
|
|
|
// changed direction?
|
|
|
|
|
if((dir1 & block->direction)==0) {
|
|
|
|
|
if(block->direction & UI_SHIFT_FLIPPED)
|
|
|
|
|
xof+= dir2==UI_LEFT?25:-25;
|
|
|
|
|
uiBlockFlipOrder(block);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else if(dir1==UI_DOWN) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
yof= butrct.ymin - block->maxy+1;
|
|
|
|
|
if(dir2==UI_RIGHT) xof= butrct.xmax - block->maxx;
|
|
|
|
|
else xof= butrct.xmin - block->minx;
|
|
|
|
|
// changed direction?
|
|
|
|
|
if((dir1 & block->direction)==0) {
|
|
|
|
|
if(block->direction & UI_SHIFT_FLIPPED)
|
|
|
|
|
xof+= dir2==UI_LEFT?25:-25;
|
|
|
|
|
uiBlockFlipOrder(block);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// apply requested offset in the block
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
xof += block->xofs/block->aspect;
|
|
|
|
|
yof += block->yofs/block->aspect;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* apply */
|
|
|
|
|
bt= block->buttons.first;
|
|
|
|
|
while(bt) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
|
|
|
|
|
ui_graphics_to_window(block->win, &bt->x1, &bt->y1);
|
|
|
|
|
ui_graphics_to_window(block->win, &bt->x2, &bt->y2);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
bt->x1 += xof;
|
|
|
|
|
bt->x2 += xof;
|
|
|
|
|
bt->y1 += yof;
|
|
|
|
|
bt->y2 += yof;
|
|
|
|
|
|
|
|
|
|
bt->aspect= 1.0;
|
|
|
|
|
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
block->minx += xof;
|
|
|
|
|
block->miny += yof;
|
|
|
|
|
block->maxx += xof;
|
|
|
|
|
block->maxy += yof;
|
|
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
/* safety calculus */
|
|
|
|
|
if(but) {
|
|
|
|
|
float midx= (block->parentrct.xmin+block->parentrct.xmax)/2.0;
|
|
|
|
|
float midy= (block->parentrct.ymin+block->parentrct.ymax)/2.0;
|
|
|
|
|
|
|
|
|
|
/* when you are outside parent button, safety there should be smaller */
|
|
|
|
|
|
|
|
|
|
// parent button to left
|
|
|
|
|
if( midx < block->minx ) block->safety.xmin= block->minx-3;
|
|
|
|
|
else block->safety.xmin= block->minx-40;
|
|
|
|
|
// parent button to right
|
|
|
|
|
if( midx > block->maxx ) block->safety.xmax= block->maxx+3;
|
|
|
|
|
else block->safety.xmax= block->maxx+40;
|
|
|
|
|
|
|
|
|
|
// parent button on bottom
|
|
|
|
|
if( midy < block->miny ) block->safety.ymin= block->miny-3;
|
|
|
|
|
else block->safety.ymin= block->miny-40;
|
|
|
|
|
// parent button on top
|
|
|
|
|
if( midy > block->maxy ) block->safety.ymax= block->maxy+3;
|
|
|
|
|
else block->safety.ymax= block->maxy+40;
|
|
|
|
|
|
|
|
|
|
// exception for switched pulldowns...
|
|
|
|
|
if(dir1 && (dir1 & block->direction)==0) {
|
|
|
|
|
if(dir2==UI_RIGHT) block->safety.xmax= block->maxx+3;
|
|
|
|
|
if(dir2==UI_LEFT) block->safety.xmin= block->minx-3;
|
|
|
|
|
}
|
2004-01-23 20:54:26 +00:00
|
|
|
block->direction= dir1|dir2;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
block->safety.xmin= block->minx-40;
|
|
|
|
|
block->safety.ymin= block->miny-40;
|
|
|
|
|
block->safety.xmax= block->maxx+40;
|
|
|
|
|
block->safety.ymax= block->maxy+40;
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-10-15 19:23:54 +00:00
|
|
|
void ui_autofill(uiBlock *block)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
float *maxw, *maxh, startx = 0, starty, height = 0;
|
|
|
|
|
float totmaxh;
|
|
|
|
|
int rows=0, /* cols=0, */ i, lasti;
|
|
|
|
|
|
|
|
|
|
/* first count rows */
|
|
|
|
|
but= block->buttons.last;
|
|
|
|
|
rows= but->x1+1;
|
|
|
|
|
|
|
|
|
|
/* calculate max width / height for each row */
|
|
|
|
|
maxw= MEM_callocN(sizeof(float)*rows, "maxw");
|
|
|
|
|
maxh= MEM_callocN(sizeof(float)*rows, "maxh");
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
i= but->x1;
|
|
|
|
|
if( maxh[i] < but->y2) maxh[i]= but->y2;
|
|
|
|
|
maxw[i] += but->x2;
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
totmaxh= 0.0;
|
|
|
|
|
for(i=0; i<rows; i++) totmaxh+= maxh[i];
|
|
|
|
|
|
|
|
|
|
/* apply widths/heights */
|
|
|
|
|
starty= block->maxy;
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
lasti= -1;
|
|
|
|
|
while(but) {
|
2003-11-23 12:22:59 +00:00
|
|
|
// signal for aligning code
|
|
|
|
|
but->flag |= UI_BUT_ALIGN_DOWN;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
i= but->x1;
|
|
|
|
|
|
|
|
|
|
if(i!=lasti) {
|
|
|
|
|
startx= block->minx;
|
|
|
|
|
height= (maxh[i]*(block->maxy-block->miny))/totmaxh;
|
|
|
|
|
starty-= height;
|
|
|
|
|
lasti= i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
but->y1= starty+but->aspect;
|
|
|
|
|
but->y2= but->y1+height-but->aspect;
|
|
|
|
|
|
|
|
|
|
but->x2= (but->x2*(block->maxx-block->minx))/maxw[i];
|
|
|
|
|
but->x1= startx+but->aspect;
|
|
|
|
|
|
|
|
|
|
startx+= but->x2;
|
|
|
|
|
but->x2+= but->x1-but->aspect;
|
|
|
|
|
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-23 12:22:59 +00:00
|
|
|
uiBlockEndAlign(block);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
MEM_freeN(maxw); MEM_freeN(maxh);
|
|
|
|
|
block->autofill= 0;
|
|
|
|
|
}
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
/* ************** LINK LINE DRAWING ************* */
|
|
|
|
|
|
|
|
|
|
/* link line drawing is not part of buttons or theme.. so we stick with it here */
|
|
|
|
|
|
|
|
|
|
static void ui_draw_linkline(uiBut *but, uiLinkLine *line)
|
|
|
|
|
{
|
|
|
|
|
float vec1[2], vec2[2];
|
|
|
|
|
|
|
|
|
|
if(line->from==NULL || line->to==NULL) return;
|
|
|
|
|
|
|
|
|
|
if(but->block->frontbuf==UI_NEED_DRAW_FRONT) {
|
|
|
|
|
but->block->frontbuf= UI_HAS_DRAW_FRONT;
|
|
|
|
|
|
|
|
|
|
glDrawBuffer(GL_FRONT);
|
|
|
|
|
if(but->win==curarea->headwin) curarea->head_swap= WIN_FRONT_OK;
|
|
|
|
|
else curarea->win_swap= WIN_FRONT_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vec1[0]= (line->from->x1+line->from->x2)/2.0;
|
|
|
|
|
vec1[1]= (line->from->y1+line->from->y2)/2.0;
|
|
|
|
|
vec2[0]= (line->to->x1+line->to->x2)/2.0;
|
|
|
|
|
vec2[1]= (line->to->y1+line->to->y2)/2.0;
|
|
|
|
|
|
|
|
|
|
if(line->flag & UI_SELECT) BIF_ThemeColorShade(but->themecol, 80);
|
|
|
|
|
else glColor3ub(0,0,0);
|
|
|
|
|
fdrawline(vec1[0], vec1[1], vec2[0], vec2[1]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_draw_links(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
uiLinkLine *line;
|
|
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type==LINK && but->link) {
|
|
|
|
|
line= but->link->lines.first;
|
|
|
|
|
while(line) {
|
|
|
|
|
ui_draw_linkline(but, line);
|
|
|
|
|
line= line->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ************** BLOCK DRAWING FUNCTION ************* */
|
|
|
|
|
|
|
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
void uiDrawBlock(uiBlock *block)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
|
2003-11-19 12:43:21 +00:00
|
|
|
/* handle pending stuff */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(block->autofill) ui_autofill(block);
|
|
|
|
|
if(block->minx==0.0 && block->maxx==0.0) uiBoundsBlock(block, 0);
|
2003-11-19 12:43:21 +00:00
|
|
|
if(block->flag & UI_BUT_ALIGN) uiBlockEndAlign(block);
|
|
|
|
|
|
2003-10-11 00:21:05 +00:00
|
|
|
uiPanelPush(block); // panel matrix
|
2003-10-04 20:35:50 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if(block->flag & UI_BLOCK_LOOP) {
|
|
|
|
|
uiDrawMenuBox(block->minx, block->miny, block->maxx, block->maxy);
|
|
|
|
|
}
|
2003-10-04 20:35:50 +00:00
|
|
|
else if(block->panel) ui_draw_panel(block);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-11 22:00:30 +00:00
|
|
|
if(block->drawextra) block->drawextra();
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
for (but= block->buttons.first; but; but= but->next) {
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ui_draw_links(block);
|
2003-10-23 22:28:49 +00:00
|
|
|
|
2003-10-11 00:21:05 +00:00
|
|
|
uiPanelPop(block); // matrix restored
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ************* MENUBUTS *********** */
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
char *str;
|
|
|
|
|
int retval;
|
2003-10-25 23:57:58 +00:00
|
|
|
int icon;
|
2002-10-12 11:37:38 +00:00
|
|
|
} MenuEntry;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
char *instr;
|
|
|
|
|
char *title;
|
|
|
|
|
|
|
|
|
|
MenuEntry *items;
|
|
|
|
|
int nitems, itemssize;
|
|
|
|
|
} MenuData;
|
|
|
|
|
|
|
|
|
|
static MenuData *menudata_new(char *instr) {
|
|
|
|
|
MenuData *md= MEM_mallocN(sizeof(*md), "MenuData");
|
|
|
|
|
|
|
|
|
|
md->instr= instr;
|
|
|
|
|
md->title= NULL;
|
|
|
|
|
md->items= NULL;
|
|
|
|
|
md->nitems= md->itemssize= 0;
|
|
|
|
|
|
|
|
|
|
return md;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void menudata_set_title(MenuData *md, char *title) {
|
|
|
|
|
if (!md->title)
|
|
|
|
|
md->title= title;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-25 23:57:58 +00:00
|
|
|
static void menudata_add_item(MenuData *md, char *str, int retval, int icon) {
|
2002-10-12 11:37:38 +00:00
|
|
|
if (md->nitems==md->itemssize) {
|
|
|
|
|
int nsize= md->itemssize?(md->itemssize<<1):1;
|
|
|
|
|
MenuEntry *oitems= md->items;
|
|
|
|
|
|
|
|
|
|
md->items= MEM_mallocN(nsize*sizeof(*md->items), "md->items");
|
|
|
|
|
if (oitems) {
|
|
|
|
|
memcpy(md->items, oitems, md->nitems*sizeof(*md->items));
|
|
|
|
|
MEM_freeN(oitems);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
md->itemssize= nsize;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
md->items[md->nitems].str= str;
|
|
|
|
|
md->items[md->nitems].retval= retval;
|
2003-10-25 23:57:58 +00:00
|
|
|
md->items[md->nitems].icon= icon;
|
2002-10-12 11:37:38 +00:00
|
|
|
md->nitems++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void menudata_free(MenuData *md) {
|
|
|
|
|
MEM_freeN(md->instr);
|
|
|
|
|
if (md->items)
|
|
|
|
|
MEM_freeN(md->items);
|
|
|
|
|
MEM_freeN(md);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Parse menu description strings, string is of the
|
|
|
|
|
* form "[sss%t|]{(sss[%xNN]|), (%l|)}", ssss%t indicates the
|
|
|
|
|
* menu title, sss or sss%xNN indicates an option,
|
|
|
|
|
* if %xNN is given then NN is the return value if
|
|
|
|
|
* that option is selected otherwise the return value
|
|
|
|
|
* is the index of the option (starting with 1). %l
|
|
|
|
|
* indicates a seperator.
|
|
|
|
|
*
|
|
|
|
|
* @param str String to be parsed.
|
|
|
|
|
* @retval new menudata structure, free with menudata_free()
|
|
|
|
|
*/
|
|
|
|
|
static MenuData *decompose_menu_string(char *str)
|
|
|
|
|
{
|
|
|
|
|
char *instr= BLI_strdup(str);
|
|
|
|
|
MenuData *md= menudata_new(instr);
|
|
|
|
|
char *nitem= NULL, *s= instr;
|
2003-10-25 23:57:58 +00:00
|
|
|
int nicon=0, nretval= 1, nitem_is_title= 0;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
|
char c= *s;
|
|
|
|
|
|
|
|
|
|
if (c=='%') {
|
|
|
|
|
if (s[1]=='x') {
|
|
|
|
|
nretval= atoi(s+2);
|
|
|
|
|
|
|
|
|
|
*s= '\0';
|
|
|
|
|
s++;
|
|
|
|
|
} else if (s[1]=='t') {
|
|
|
|
|
nitem_is_title= 1;
|
|
|
|
|
|
|
|
|
|
*s= '\0';
|
|
|
|
|
s++;
|
|
|
|
|
} else if (s[1]=='l') {
|
|
|
|
|
nitem= "%l";
|
|
|
|
|
s++;
|
2003-10-25 23:57:58 +00:00
|
|
|
} else if (s[1]=='i') {
|
|
|
|
|
nicon= atoi(s+2);
|
|
|
|
|
s++;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
} else if (c=='|' || c=='\0') {
|
|
|
|
|
if (nitem) {
|
|
|
|
|
*s= '\0';
|
|
|
|
|
|
|
|
|
|
if (nitem_is_title) {
|
|
|
|
|
menudata_set_title(md, nitem);
|
|
|
|
|
nitem_is_title= 0;
|
|
|
|
|
} else {
|
2003-10-25 23:57:58 +00:00
|
|
|
menudata_add_item(md, nitem, nretval, nicon);
|
2002-10-12 11:37:38 +00:00
|
|
|
nretval= md->nitems+1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nitem= NULL;
|
2003-10-25 23:57:58 +00:00
|
|
|
nicon= 0;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (c=='\0')
|
|
|
|
|
break;
|
|
|
|
|
} else if (!nitem)
|
|
|
|
|
nitem= s;
|
|
|
|
|
|
|
|
|
|
s++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return md;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_set_name_menu(uiBut *but, int value)
|
|
|
|
|
{
|
|
|
|
|
MenuData *md;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
md= decompose_menu_string(but->str);
|
|
|
|
|
for (i=0; i<md->nitems; i++)
|
|
|
|
|
if (md->items[i].retval==value)
|
|
|
|
|
strcpy(but->drawstr, md->items[i].str);
|
|
|
|
|
menudata_free(md);
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-18 18:32:57 +00:00
|
|
|
static void ui_warp_pointer(short x, short y)
|
2003-07-10 20:34:41 +00:00
|
|
|
{
|
|
|
|
|
/* OSX has very poor mousewarp support, it sends events;
|
|
|
|
|
this causes a menu being pressed immediately ... */
|
|
|
|
|
#ifndef __APPLE__
|
|
|
|
|
warp_pointer(x, y);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
|
2003-10-07 22:55:16 +00:00
|
|
|
static int ui_do_but_MENU(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
ListBase listb={NULL, NULL};
|
|
|
|
|
double fvalue;
|
2003-10-17 19:03:53 +00:00
|
|
|
int width, height=0, a, xmax, starty;
|
2003-10-07 22:55:16 +00:00
|
|
|
short startx;
|
|
|
|
|
int columns=1, rows=0, boxh, event;
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
short x1, y1, active= -1;
|
2003-10-07 22:55:16 +00:00
|
|
|
short mval[2];
|
|
|
|
|
MenuData *md;
|
|
|
|
|
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, but->win);
|
|
|
|
|
block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
|
2003-10-20 18:15:06 +00:00
|
|
|
block->themecol= TH_MENU_ITEM;
|
2003-10-07 22:55:16 +00:00
|
|
|
|
|
|
|
|
md= decompose_menu_string(but->str);
|
|
|
|
|
|
|
|
|
|
/* columns and row calculation */
|
|
|
|
|
columns= (md->nitems+20)/20;
|
|
|
|
|
if (columns<1) columns= 1;
|
|
|
|
|
|
|
|
|
|
rows= (int) md->nitems/columns;
|
|
|
|
|
if (rows<1) rows= 1;
|
|
|
|
|
|
|
|
|
|
while (rows*columns<md->nitems) rows++;
|
|
|
|
|
|
|
|
|
|
/* size and location */
|
|
|
|
|
if(md->title)
|
2004-01-13 14:50:45 +00:00
|
|
|
width= 1.5*but->aspect*strlen(md->title)+BIF_GetStringWidth(block->curfont, md->title, (U.transopts & USER_TR_MENUS));
|
2003-10-07 22:55:16 +00:00
|
|
|
else
|
|
|
|
|
width= 0;
|
|
|
|
|
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
2004-01-13 14:50:45 +00:00
|
|
|
xmax= but->aspect*BIF_GetStringWidth(block->curfont, md->items[a].str, (U.transopts & USER_TR_MENUS));
|
2003-10-07 22:55:16 +00:00
|
|
|
if(xmax>width) width= xmax;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
width+= 10;
|
2003-10-21 07:02:04 +00:00
|
|
|
if (width < (but->x2 - but->x1)) width = (but->x2 - but->x1);
|
2003-10-07 22:55:16 +00:00
|
|
|
if (width<50) width=50;
|
|
|
|
|
|
|
|
|
|
boxh= TBOXH;
|
|
|
|
|
|
|
|
|
|
height= rows*boxh;
|
|
|
|
|
if (md->title) height+= boxh;
|
|
|
|
|
|
|
|
|
|
getmouseco_sc(mval);
|
|
|
|
|
|
|
|
|
|
/* find active item */
|
|
|
|
|
fvalue= ui_get_but_val(but);
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
for(active=0; active<md->nitems; active++) {
|
|
|
|
|
if( md->items[active].retval== (int)fvalue ) break;
|
2003-10-07 22:55:16 +00:00
|
|
|
}
|
|
|
|
|
/* no active item? */
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
if(active==md->nitems) {
|
|
|
|
|
if(md->title) active= -1;
|
|
|
|
|
else active= 0;
|
2003-10-07 22:55:16 +00:00
|
|
|
}
|
|
|
|
|
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
/* for now disabled... works confusing because you think it's a title or so.... */
|
|
|
|
|
active= -1;
|
|
|
|
|
|
2003-10-07 22:55:16 +00:00
|
|
|
/* here we go! */
|
|
|
|
|
startx= but->x1;
|
|
|
|
|
starty= but->y1;
|
|
|
|
|
|
|
|
|
|
if(md->title) {
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
uiSetCurFont(block, block->font+1);
|
|
|
|
|
bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+rows*boxh), (short)width, (short)boxh, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
uiSetCurFont(block, block->font);
|
|
|
|
|
bt->flag= UI_TEXT_LEFT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
x1= but->x1 + width*((int)(md->nitems-a-1)/rows);
|
2003-10-07 22:55:16 +00:00
|
|
|
y1= but->y1 - boxh*(a%rows) + (rows-1)*boxh;
|
|
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if (strcmp(md->items[md->nitems-a-1].str, "%l")==0) {
|
2003-10-07 22:55:16 +00:00
|
|
|
uiDefBut(block, SEPR, B_NOP, "", x1, y1,(short)(width-(rows>1)), (short)(boxh-1), NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
}
|
2003-10-25 23:57:58 +00:00
|
|
|
else if(md->items[md->nitems-a-1].icon) {
|
|
|
|
|
uiBut *bt= uiDefIconTextBut(block, BUTM|but->pointype, but->retval, md->items[md->nitems-a-1].icon ,md->items[md->nitems-a-1].str, x1, y1,(short)(width-(rows>1)), (short)(boxh-1), but->poin, (float) md->items[md->nitems-a-1].retval, 0.0, 0, 0, "");
|
|
|
|
|
if(active==a) bt->flag |= UI_ACTIVE;
|
|
|
|
|
}
|
2003-10-07 22:55:16 +00:00
|
|
|
else {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
uiBut *bt= uiDefBut(block, BUTM|but->pointype, but->retval, md->items[md->nitems-a-1].str, x1, y1,(short)(width-(rows>1)), (short)(boxh-1), but->poin, (float) md->items[md->nitems-a-1].retval, 0.0, 0, 0, "");
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
if(active==a) bt->flag |= UI_ACTIVE;
|
2003-10-07 22:55:16 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
block->direction= UI_TOP;
|
2003-10-07 22:55:16 +00:00
|
|
|
ui_positionblock(block, but);
|
|
|
|
|
block->win= G.curscreen->mainwin;
|
|
|
|
|
event= uiDoBlocks(&listb, 0);
|
|
|
|
|
|
|
|
|
|
menudata_free(md);
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
|
|
|
|
|
return event;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* ************* EVENTS ************* */
|
|
|
|
|
|
|
|
|
|
void uiGetMouse(int win, short *adr)
|
|
|
|
|
{
|
|
|
|
|
int x, y;
|
|
|
|
|
float xwin, ywin;
|
|
|
|
|
|
|
|
|
|
getmouseco_sc(adr);
|
|
|
|
|
if (win == G.curscreen->mainwin) return;
|
|
|
|
|
|
|
|
|
|
bwin_getsuborigin(win, &x, &y);
|
|
|
|
|
|
|
|
|
|
adr[0]-= x;
|
|
|
|
|
adr[1]-= y;
|
|
|
|
|
|
|
|
|
|
xwin= adr[0];
|
|
|
|
|
ywin= adr[1];
|
|
|
|
|
|
|
|
|
|
ui_window_to_graphics(win, &xwin, &ywin);
|
|
|
|
|
|
|
|
|
|
adr[0]= (short)(xwin+0.5);
|
|
|
|
|
adr[1]= (short)(ywin+0.5);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_is_but_sel(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
double value;
|
|
|
|
|
int lvalue;
|
|
|
|
|
short push=0, true=1;
|
|
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
|
|
|
|
|
if( but->type==TOGN ) true= 0;
|
|
|
|
|
|
|
|
|
|
if( but->bit ) {
|
|
|
|
|
lvalue= (int)value;
|
|
|
|
|
if( BTST(lvalue, (but->bitnr)) ) push= true;
|
|
|
|
|
else push= !true;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
switch(but->type) {
|
|
|
|
|
case BUT:
|
|
|
|
|
push= 0;
|
|
|
|
|
break;
|
|
|
|
|
case KEYEVT:
|
|
|
|
|
if (value==-1) push= 1;
|
|
|
|
|
break;
|
|
|
|
|
case TOG:
|
|
|
|
|
case TOGR:
|
|
|
|
|
case TOG3:
|
|
|
|
|
case ICONTOG:
|
2003-10-27 16:13:45 +00:00
|
|
|
if(value!=but->min) push= 1;
|
2002-10-12 11:37:38 +00:00
|
|
|
break;
|
|
|
|
|
case TOGN:
|
|
|
|
|
if(value==0.0) push= 1;
|
|
|
|
|
break;
|
|
|
|
|
case ROW:
|
|
|
|
|
if(value == but->max) push= 1;
|
|
|
|
|
break;
|
|
|
|
|
case COL:
|
|
|
|
|
push= 1;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
push= 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(push==2);
|
|
|
|
|
else if(push==1) but->flag |= UI_SELECT;
|
|
|
|
|
else but->flag &= ~UI_SELECT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_BUT(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
int activated;
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
int oflag= but->flag;
|
|
|
|
|
short mval[2];
|
|
|
|
|
|
|
|
|
|
uiGetMouse(mywinget(), mval);
|
|
|
|
|
|
|
|
|
|
if (uibut_contains_pt(but, mval))
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
else
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
|
2003-07-08 10:15:42 +00:00
|
|
|
if (but->flag != oflag) {
|
2002-10-12 11:37:38 +00:00
|
|
|
ui_draw_but(but);
|
2003-07-08 10:15:42 +00:00
|
|
|
glFinish(); // flush display in subloops
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PIL_sleep_ms(10);
|
2002-10-12 11:37:38 +00:00
|
|
|
} while (get_mbut() & L_MOUSE);
|
|
|
|
|
|
|
|
|
|
activated= (but->flag & UI_SELECT);
|
|
|
|
|
|
|
|
|
|
if(activated) {
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
return activated?but->retval:0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_KEYEVT(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
unsigned short event= 0;
|
|
|
|
|
short val;
|
|
|
|
|
|
|
|
|
|
/* flag for ui_check_but */
|
|
|
|
|
ui_set_but_val(but, -1);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
event= extern_qread(&val);
|
|
|
|
|
} while (!event || !val || ELEM(event, MOUSEX, MOUSEY));
|
|
|
|
|
|
|
|
|
|
if (!key_event_to_string(event)[0]) event= 0;
|
|
|
|
|
|
|
|
|
|
ui_set_but_val(but, (double) event);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
return (event!=0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_TOG(uiBlock *block, uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
double value;
|
|
|
|
|
int w, lvalue, push;
|
|
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
lvalue= (int)value;
|
|
|
|
|
|
|
|
|
|
if(but->bit) {
|
|
|
|
|
w= BTST(lvalue, but->bitnr);
|
|
|
|
|
if(w) lvalue = BCLR(lvalue, but->bitnr);
|
|
|
|
|
else lvalue = BSET(lvalue, but->bitnr);
|
|
|
|
|
|
|
|
|
|
if(but->type==TOGR) {
|
|
|
|
|
if( (get_qual() & LR_SHIFTKEY)==0 ) {
|
|
|
|
|
lvalue= 1<<(but->bitnr);
|
|
|
|
|
|
|
|
|
|
ui_set_but_val(but, (double)lvalue);
|
|
|
|
|
|
|
|
|
|
bt= block->buttons.first;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if( bt!=but && bt->poin==but->poin ) {
|
|
|
|
|
ui_is_but_sel(bt);
|
|
|
|
|
ui_draw_but(bt);
|
|
|
|
|
}
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(lvalue==0) lvalue= 1<<(but->bitnr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ui_set_but_val(but, (double)lvalue);
|
|
|
|
|
if(but->type==ICONTOG) ui_check_but(but);
|
2003-10-28 14:20:03 +00:00
|
|
|
// no frontbuffer draw for this one
|
|
|
|
|
if((but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
|
|
if(value==0.0) push= 1;
|
|
|
|
|
else push= 0;
|
|
|
|
|
|
|
|
|
|
if(but->type==TOGN) push= !push;
|
|
|
|
|
ui_set_but_val(but, (double)push);
|
|
|
|
|
if(but->type==ICONTOG) ui_check_but(but);
|
2003-10-28 14:20:03 +00:00
|
|
|
// no frontbuffer draw for this one
|
|
|
|
|
if((but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* no while loop...this button is used for viewmove */
|
|
|
|
|
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_ROW(uiBlock *block, uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
|
|
|
|
|
ui_set_but_val(but, but->max);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
bt= block->buttons.first;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if( bt!=but && bt->type==ROW ) {
|
|
|
|
|
if(bt->min==but->min) {
|
|
|
|
|
ui_is_but_sel(bt);
|
|
|
|
|
ui_draw_but(bt);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_TEX(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
unsigned short dev;
|
|
|
|
|
short x, mval[2], len=0, dodraw;
|
|
|
|
|
char *str, backstr[UI_MAX_DRAW_STR];
|
2003-12-28 21:28:35 +00:00
|
|
|
short capturing;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
str= (char *)but->poin;
|
|
|
|
|
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
|
|
|
|
|
uiGetMouse(mywinget(), mval);
|
|
|
|
|
|
|
|
|
|
/* calculate cursor pos with current mousecoords */
|
|
|
|
|
BLI_strncpy(backstr, but->drawstr, UI_MAX_DRAW_STR);
|
|
|
|
|
but->pos= strlen(backstr)-but->ofs;
|
2003-07-14 13:48:44 +00:00
|
|
|
|
2004-01-13 14:50:45 +00:00
|
|
|
while((but->aspect*BIF_GetStringWidth(but->font, backstr+but->ofs, (U.transopts & USER_TR_BUTTONS)) + but->x1) > mval[0]) {
|
2002-10-12 11:37:38 +00:00
|
|
|
if (but->pos <= 0) break;
|
|
|
|
|
but->pos--;
|
|
|
|
|
backstr[but->pos+but->ofs] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
but->pos -= strlen(but->str);
|
|
|
|
|
but->pos += but->ofs;
|
|
|
|
|
if(but->pos<0) but->pos= 0;
|
|
|
|
|
|
|
|
|
|
/* backup */
|
|
|
|
|
BLI_strncpy(backstr, but->poin, UI_MAX_DRAW_STR);
|
|
|
|
|
|
|
|
|
|
ui_draw_but(but);
|
2003-07-08 10:15:42 +00:00
|
|
|
glFinish(); // flush display in subloops
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
while (get_mbut() & L_MOUSE) BIF_wait_for_statechange();
|
|
|
|
|
len= strlen(str);
|
|
|
|
|
but->min= 0.0;
|
|
|
|
|
|
2003-12-28 21:28:35 +00:00
|
|
|
capturing = TRUE;
|
|
|
|
|
while(capturing) {
|
2002-10-12 11:37:38 +00:00
|
|
|
char ascii;
|
|
|
|
|
short val;
|
|
|
|
|
|
|
|
|
|
dodraw= 0;
|
|
|
|
|
dev = extern_qread_ext(&val, &ascii);
|
|
|
|
|
|
|
|
|
|
if(dev==INPUTCHANGE) break;
|
|
|
|
|
else if(get_mbut() & L_MOUSE) break;
|
|
|
|
|
else if(get_mbut() & R_MOUSE) break;
|
|
|
|
|
else if(dev==ESCKEY) break;
|
|
|
|
|
else if(dev==MOUSEX) val= 0;
|
|
|
|
|
else if(dev==MOUSEY) val= 0;
|
|
|
|
|
|
|
|
|
|
if(ascii) {
|
2004-01-07 23:33:40 +00:00
|
|
|
if(len < but->max) {
|
|
|
|
|
for(x= but->max; x>but->pos; x--)
|
|
|
|
|
str[x]= str[x-1];
|
|
|
|
|
str[but->pos]= ascii;
|
|
|
|
|
but->pos++;
|
|
|
|
|
len++;
|
|
|
|
|
str[len]= '\0';
|
|
|
|
|
dodraw= 1;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(val) {
|
|
|
|
|
|
2003-12-28 21:28:35 +00:00
|
|
|
switch (dev) {
|
|
|
|
|
|
|
|
|
|
case RIGHTARROWKEY:
|
2002-10-12 11:37:38 +00:00
|
|
|
if(G.qual & LR_SHIFTKEY) but->pos= strlen(str);
|
|
|
|
|
else but->pos++;
|
|
|
|
|
if(but->pos>strlen(str)) but->pos= strlen(str);
|
|
|
|
|
dodraw= 1;
|
2003-12-28 21:28:35 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LEFTARROWKEY:
|
2002-10-12 11:37:38 +00:00
|
|
|
if(G.qual & LR_SHIFTKEY) but->pos= 0;
|
|
|
|
|
else if(but->pos>0) but->pos--;
|
|
|
|
|
dodraw= 1;
|
|
|
|
|
break;
|
2003-12-28 21:28:35 +00:00
|
|
|
|
|
|
|
|
case ENDKEY:
|
|
|
|
|
but->pos= strlen(str);
|
|
|
|
|
dodraw= 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case HOMEKEY:
|
|
|
|
|
but->pos= 0;
|
|
|
|
|
dodraw= 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case PADENTER:
|
|
|
|
|
case RETKEY:
|
|
|
|
|
capturing = FALSE;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DELKEY:
|
|
|
|
|
if(but->pos>=0 && but->pos<strlen(str)) {
|
|
|
|
|
for(x=but->pos; x<=strlen(str); x++)
|
|
|
|
|
str[x]= str[x+1];
|
|
|
|
|
str[--len]='\0';
|
|
|
|
|
dodraw= 1;
|
|
|
|
|
}
|
2004-01-07 23:33:40 +00:00
|
|
|
break;
|
|
|
|
|
|
2003-12-28 21:28:35 +00:00
|
|
|
case BACKSPACEKEY:
|
2002-10-12 11:37:38 +00:00
|
|
|
if(len!=0) {
|
|
|
|
|
if(get_qual() & LR_SHIFTKEY) {
|
|
|
|
|
str[0]= 0;
|
|
|
|
|
but->pos= 0;
|
|
|
|
|
len= 0;
|
|
|
|
|
dodraw= 1;
|
|
|
|
|
}
|
|
|
|
|
else if(but->pos>0) {
|
|
|
|
|
for(x=but->pos; x<=strlen(str); x++)
|
|
|
|
|
str[x-1]= str[x];
|
|
|
|
|
but->pos--;
|
|
|
|
|
str[--len]='\0';
|
|
|
|
|
dodraw= 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-12-28 21:28:35 +00:00
|
|
|
break;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
2003-12-28 21:28:35 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if(dodraw) {
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
2003-07-07 15:50:44 +00:00
|
|
|
glFinish(); // flush display in subloops
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(dev==ESCKEY) strcpy(but->poin, backstr);
|
|
|
|
|
but->pos= -1;
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
if(dev!=ESCKEY) return but->retval;
|
|
|
|
|
else return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int uiActAsTextBut(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
double value;
|
|
|
|
|
float min, max;
|
|
|
|
|
int temp, retval, textleft;
|
|
|
|
|
char str[UI_MAX_DRAW_STR], *point;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
if( but->pointype==FLO ) {
|
2003-06-21 20:24:42 +00:00
|
|
|
if(but->a2) { /* amount of digits defined */
|
|
|
|
|
if(but->a2==1) sprintf(str, "%.1f", value);
|
|
|
|
|
else if(but->a2==2) sprintf(str, "%.2f", value);
|
|
|
|
|
else if(but->a2==3) sprintf(str, "%.3f", value);
|
|
|
|
|
else sprintf(str, "%.4f", value);
|
|
|
|
|
}
|
|
|
|
|
else sprintf(str, "%.3f", value);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
sprintf(str, "%d", (int)value);
|
|
|
|
|
}
|
|
|
|
|
point= but->poin;
|
|
|
|
|
but->poin= str;
|
|
|
|
|
min= but->min;
|
|
|
|
|
max= but->max;
|
|
|
|
|
but->min= 0.0;
|
|
|
|
|
but->max= 15.0;
|
|
|
|
|
temp= but->type;
|
|
|
|
|
but->type= TEX;
|
|
|
|
|
textleft= but->flag & UI_TEXT_LEFT;
|
|
|
|
|
but->flag |= UI_TEXT_LEFT;
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
|
|
|
|
|
retval= ui_do_but_TEX(but);
|
|
|
|
|
|
|
|
|
|
but->type= temp;
|
|
|
|
|
but->poin= point;
|
|
|
|
|
but->min= min;
|
|
|
|
|
but->max= max;
|
|
|
|
|
if(textleft==0) but->flag &= ~UI_TEXT_LEFT;
|
|
|
|
|
|
|
|
|
|
if( but->pointype==FLO ) value= atof(str);
|
|
|
|
|
else value= atoi(str);
|
|
|
|
|
|
|
|
|
|
if(value<min) value= min;
|
|
|
|
|
if(value>max) value= max;
|
|
|
|
|
|
|
|
|
|
ui_set_but_val(but, value);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_NUM(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
double value;
|
|
|
|
|
float deler, fstart, f, tempf;
|
|
|
|
|
int lvalue, temp; /* , firsttime=1; */
|
|
|
|
|
short qual, sx, mval[2], pos=0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
ui_draw_but(but);
|
2003-07-18 18:32:57 +00:00
|
|
|
glFinish(); // flush display before subloop
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
uiGetMouse(mywinget(), mval);
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
|
|
|
|
|
sx= mval[0];
|
|
|
|
|
fstart= (value - but->min)/(but->max-but->min);
|
|
|
|
|
f= fstart;
|
|
|
|
|
|
|
|
|
|
temp= (int)value;
|
|
|
|
|
tempf= value;
|
|
|
|
|
|
|
|
|
|
if(get_qual() & LR_SHIFTKEY) { /* make it textbut */
|
|
|
|
|
if( uiActAsTextBut(but) ) return but->retval;
|
|
|
|
|
else return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* firsttime: this button can be approached with enter as well */
|
|
|
|
|
while (get_mbut() & L_MOUSE) {
|
|
|
|
|
qual= get_qual();
|
|
|
|
|
|
|
|
|
|
deler= 500;
|
|
|
|
|
if( but->pointype!=FLO ) {
|
|
|
|
|
|
|
|
|
|
if( (but->max-but->min)<100 ) deler= 200.0;
|
|
|
|
|
if( (but->max-but->min)<25 ) deler= 50.0;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
if(qual & LR_SHIFTKEY) deler*= 10.0;
|
|
|
|
|
if(qual & LR_ALTKEY) deler*= 20.0;
|
|
|
|
|
|
|
|
|
|
uiGetMouse(mywinget(), mval);
|
|
|
|
|
|
|
|
|
|
if(mval[0] != sx) {
|
|
|
|
|
|
|
|
|
|
f+= ((float)(mval[0]-sx))/deler;
|
|
|
|
|
if(f>1.0) f= 1.0;
|
|
|
|
|
if(f<0.0) f= 0.0;
|
|
|
|
|
sx= mval[0];
|
|
|
|
|
tempf= ( but->min + f*(but->max-but->min));
|
|
|
|
|
|
|
|
|
|
if( but->pointype!=FLO ) {
|
|
|
|
|
|
|
|
|
|
temp= floor(tempf+.5);
|
|
|
|
|
|
|
|
|
|
if(tempf==but->min || tempf==but->max);
|
|
|
|
|
else if(qual & LR_CTRLKEY) temp= 10*(temp/10);
|
|
|
|
|
|
|
|
|
|
if( temp>=but->min && temp<=but->max) {
|
|
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
lvalue= (int)value;
|
|
|
|
|
|
|
|
|
|
if(temp != lvalue ) {
|
|
|
|
|
pos= 1;
|
|
|
|
|
ui_set_but_val(but, (double)temp);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
2003-07-07 15:50:44 +00:00
|
|
|
glFinish(); // flush display in subloops
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
temp= 0;
|
|
|
|
|
if(qual & LR_CTRLKEY) {
|
|
|
|
|
if(tempf==but->min || tempf==but->max);
|
|
|
|
|
else if(but->max-but->min < 2.10) tempf= 0.1*floor(10*tempf);
|
|
|
|
|
else if(but->max-but->min < 21.0) tempf= floor(tempf);
|
|
|
|
|
else tempf= 10.0*floor(tempf/10.0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( tempf>=but->min && tempf<=but->max) {
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
|
|
|
|
|
if(tempf != value ) {
|
|
|
|
|
pos= 1;
|
|
|
|
|
ui_set_but_val(but, tempf);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
2003-07-07 15:50:44 +00:00
|
|
|
glFinish(); // flush display in subloops
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
BIF_wait_for_statechange();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(pos==0) { /* plus 1 or minus 1 */
|
|
|
|
|
if( but->pointype!=FLO ) {
|
|
|
|
|
|
|
|
|
|
if(sx<(but->x1+but->x2)/2) temp--;
|
|
|
|
|
else temp++;
|
|
|
|
|
|
|
|
|
|
if( temp>=but->min && temp<=but->max)
|
|
|
|
|
ui_set_but_val(but, (double)temp);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
|
|
if(sx<(but->x1+but->x2)/2) tempf-= 0.01*but->a1;
|
|
|
|
|
else tempf+= 0.01*but->a1;
|
|
|
|
|
|
|
|
|
|
if (tempf < but->min) tempf = but->min;
|
|
|
|
|
if (tempf > but->max) tempf = but->max;
|
|
|
|
|
|
|
|
|
|
ui_set_but_val(but, tempf);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
2003-07-07 15:50:44 +00:00
|
|
|
glFinish(); // flush display in subloops
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_TOG3(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
if( but->pointype==SHO ) {
|
|
|
|
|
short *sp= (short *)but->poin;
|
|
|
|
|
|
|
|
|
|
if( BTST(sp[1], but->bitnr)) {
|
|
|
|
|
sp[1]= BCLR(sp[1], but->bitnr);
|
|
|
|
|
sp[0]= BCLR(sp[0], but->bitnr);
|
|
|
|
|
}
|
|
|
|
|
else if( BTST(sp[0], but->bitnr)) {
|
|
|
|
|
sp[1]= BSET(sp[1], but->bitnr);
|
|
|
|
|
} else {
|
|
|
|
|
sp[0]= BSET(sp[0], but->bitnr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if( BTST(*(but->poin+2), but->bitnr)) {
|
|
|
|
|
*(but->poin+2)= BCLR(*(but->poin+2), but->bitnr);
|
|
|
|
|
*(but->poin)= BCLR(*(but->poin), but->bitnr);
|
|
|
|
|
}
|
|
|
|
|
else if( BTST(*(but->poin), but->bitnr)) {
|
|
|
|
|
*(but->poin+2)= BSET(*(but->poin+2), but->bitnr);
|
|
|
|
|
} else {
|
|
|
|
|
*(but->poin)= BSET(*(but->poin), but->bitnr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ui_is_but_sel(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_ICONROW(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
ListBase listb= {NULL, NULL};
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
int a;
|
|
|
|
|
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
/* here we go! */
|
|
|
|
|
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, but->win);
|
|
|
|
|
block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
|
2003-10-20 18:15:06 +00:00
|
|
|
block->themecol= TH_MENU_ITEM;
|
2003-10-05 21:00:01 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
for(a=(int)but->min; a<=(int)but->max; a++) {
|
|
|
|
|
uiDefIconBut(block, BUTM|but->pointype, but->retval, but->icon+(a-but->min), 0, (short)(18*a), (short)(but->x2-but->x1-4), 18, but->poin, (float)a, 0.0, 0, 0, "");
|
|
|
|
|
}
|
|
|
|
|
block->direction= UI_TOP;
|
|
|
|
|
ui_positionblock(block, but);
|
|
|
|
|
|
|
|
|
|
/* the block is made with but-win, but is handled in mainwin space...
|
|
|
|
|
this is needs better implementation */
|
|
|
|
|
block->win= G.curscreen->mainwin;
|
|
|
|
|
|
|
|
|
|
uiDoBlocks(&listb, 0);
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
2003-05-10 10:36:14 +00:00
|
|
|
static int ui_do_but_ICONTEXTROW(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
ListBase listb={NULL, NULL};
|
|
|
|
|
int width, a, xmax, ypos;
|
|
|
|
|
MenuData *md;
|
|
|
|
|
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, but->win);
|
|
|
|
|
block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
|
2003-10-20 18:15:06 +00:00
|
|
|
block->themecol= TH_MENU_ITEM;
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
|
2003-05-10 10:36:14 +00:00
|
|
|
md= decompose_menu_string(but->str);
|
|
|
|
|
|
|
|
|
|
/* size and location */
|
|
|
|
|
/* expand menu width to fit labels */
|
|
|
|
|
if(md->title)
|
2004-01-13 14:50:45 +00:00
|
|
|
width= 2*strlen(md->title)+BIF_GetStringWidth(block->curfont, md->title, (U.transopts & USER_TR_MENUS));
|
2003-05-10 10:36:14 +00:00
|
|
|
else
|
|
|
|
|
width= 0;
|
2003-07-14 13:48:44 +00:00
|
|
|
|
2003-05-10 10:36:14 +00:00
|
|
|
for(a=0; a<md->nitems; a++) {
|
2004-01-13 14:50:45 +00:00
|
|
|
xmax= BIF_GetStringWidth(block->curfont, md->items[a].str, (U.transopts & USER_TR_MENUS));
|
2003-05-10 10:36:14 +00:00
|
|
|
if(xmax>width) width= xmax;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
width+= 30;
|
|
|
|
|
if (width<50) width=50;
|
|
|
|
|
|
|
|
|
|
ypos = 0;
|
|
|
|
|
|
|
|
|
|
/* loop through the menu options and draw them out with icons & text labels */
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
|
|
|
|
|
|
|
|
|
/* add a space if there's a separator (%l) */
|
|
|
|
|
if (strcmp(md->items[a].str, "%l")==0) {
|
|
|
|
|
ypos +=3;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2003-10-15 13:47:15 +00:00
|
|
|
uiDefIconTextBut(block, BUTM|but->pointype, but->retval, (short)((but->icon)+(md->items[a].retval-but->min)), md->items[a].str, 0, ypos,(short)width, 19, but->poin, (float) md->items[a].retval, 0.0, 0, 0, "");
|
2003-05-10 10:36:14 +00:00
|
|
|
ypos += 20;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
block->direction= UI_TOP;
|
|
|
|
|
ui_positionblock(block, but);
|
|
|
|
|
|
|
|
|
|
/* the block is made with but-win, but is handled in mainwin space...
|
|
|
|
|
this is needs better implementation */
|
|
|
|
|
block->win= G.curscreen->mainwin;
|
|
|
|
|
|
|
|
|
|
uiBoundsBlock(block, 3);
|
|
|
|
|
|
|
|
|
|
uiDoBlocks(&listb, 0);
|
|
|
|
|
|
|
|
|
|
menudata_free(md);
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
static int ui_do_but_IDPOIN(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
char str[UI_MAX_DRAW_STR];
|
|
|
|
|
ID *id;
|
|
|
|
|
|
|
|
|
|
id= *but->idpoin_idpp;
|
|
|
|
|
if(id) strcpy(str, id->name+2);
|
|
|
|
|
else str[0]= 0;
|
|
|
|
|
|
|
|
|
|
but->type= TEX;
|
|
|
|
|
but->poin= str;
|
|
|
|
|
but->min= 0.0;
|
|
|
|
|
but->max= 22.0;
|
|
|
|
|
ui_do_but_TEX(but);
|
|
|
|
|
but->poin= NULL;
|
|
|
|
|
but->type= IDPOIN;
|
|
|
|
|
|
|
|
|
|
but->idpoin_func(str, but->idpoin_idpp);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_SLI(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
float f, fstart, tempf = 0.0, deler, value;
|
|
|
|
|
int sx, h, temp, pos=0, lvalue, redraw;
|
|
|
|
|
short mval[2], qual;
|
|
|
|
|
float curmatrix[4][4];
|
|
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
uiGetMouse(mywinget(), mval);
|
|
|
|
|
|
|
|
|
|
sx= mval[0];
|
|
|
|
|
h= but->y2-but->y1;
|
|
|
|
|
fstart= but->max-but->min;
|
|
|
|
|
fstart= (value - but->min)/fstart;
|
|
|
|
|
temp= 32767;
|
|
|
|
|
|
2003-10-11 10:57:38 +00:00
|
|
|
if( but->type==NUMSLI) deler= ( (but->x2-but->x1)/2 - 5.0*but->aspect);
|
|
|
|
|
else if( but->type==HSVSLI) deler= ( (but->x2-but->x1)/2 - 5.0*but->aspect);
|
|
|
|
|
else deler= (but->x2-but->x1- 5.0*but->aspect);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
while (get_mbut() & L_MOUSE) {
|
|
|
|
|
|
|
|
|
|
qual= get_qual();
|
|
|
|
|
uiGetMouse(mywinget(), mval);
|
|
|
|
|
|
|
|
|
|
f= (float)(mval[0]-sx)/deler +fstart;
|
|
|
|
|
|
|
|
|
|
if(qual & LR_CTRLKEY) {
|
|
|
|
|
if(qual & LR_SHIFTKEY) f= floor(f*100.0)/100.0;
|
|
|
|
|
else f= floor(f*10.0)/10.0;
|
|
|
|
|
}
|
|
|
|
|
else if (qual & LR_SHIFTKEY) {
|
|
|
|
|
f= (f-fstart)/10.0 + fstart;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CLAMP(f, 0.0, 1.0);
|
|
|
|
|
tempf= but->min+f*(but->max-but->min);
|
|
|
|
|
|
|
|
|
|
temp= floor(tempf+.5);
|
|
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
lvalue= (int) value;
|
|
|
|
|
|
|
|
|
|
if( but->pointype!=FLO )
|
|
|
|
|
redraw= (temp != lvalue);
|
|
|
|
|
else
|
|
|
|
|
redraw= (tempf != value);
|
|
|
|
|
|
|
|
|
|
if (redraw) {
|
|
|
|
|
pos= 1;
|
|
|
|
|
|
|
|
|
|
ui_set_but_val(but, tempf);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
2003-07-07 15:50:44 +00:00
|
|
|
glFinish(); // flush display in subloops
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-04-30 13:22:26 +00:00
|
|
|
if(but->a1) { /* color number */
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *bt= but->prev;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if(bt->retval == but->a1) ui_draw_but(bt);
|
|
|
|
|
bt= bt->prev;
|
|
|
|
|
}
|
|
|
|
|
bt= but->next;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if(bt->retval == but->a1) ui_draw_but(bt);
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* save current window matrix (global UIwinmat)
|
|
|
|
|
because button callback function MIGHT change it
|
|
|
|
|
- which has until now occured through the Python API
|
|
|
|
|
*/
|
|
|
|
|
Mat4CpyMat4(curmatrix, UIwinmat);
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
Mat4CpyMat4(UIwinmat, curmatrix);
|
|
|
|
|
}
|
|
|
|
|
else BIF_wait_for_statechange();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-04-30 13:22:26 +00:00
|
|
|
if(temp!=32767 && pos==0) { /* plus 1 or minus 1 */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
if( but->type==SLI) f= (float)(mval[0]-but->x1)/(but->x2-but->x1-h);
|
|
|
|
|
else f= (float)(mval[0]- (but->x1+but->x2)/2)/( (but->x2-but->x1)/2 - h);
|
|
|
|
|
|
|
|
|
|
f= but->min+f*(but->max-but->min);
|
|
|
|
|
|
|
|
|
|
if( but->pointype!=FLO ) {
|
|
|
|
|
|
|
|
|
|
if(f<temp) temp--;
|
|
|
|
|
else temp++;
|
|
|
|
|
if( temp>=but->min && temp<=but->max)
|
|
|
|
|
ui_set_but_val(but, (float)temp);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
|
|
if(f<tempf) tempf-=.01;
|
|
|
|
|
else tempf+=.01;
|
|
|
|
|
if( tempf>=but->min && tempf<=but->max)
|
|
|
|
|
ui_set_but_val(but, tempf);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
ui_draw_but(but);
|
2003-07-07 15:50:44 +00:00
|
|
|
glFinish(); // flush display in subloops
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_NUMSLI(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
short mval[2];
|
2003-04-30 13:22:26 +00:00
|
|
|
|
|
|
|
|
/* first define if it's a slider or textbut */
|
2002-10-12 11:37:38 +00:00
|
|
|
uiGetMouse(mywinget(), mval);
|
|
|
|
|
|
|
|
|
|
if(mval[0]>= -6+(but->x1+but->x2)/2 ) { /* slider */
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
ui_do_but_SLI(but);
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
uiActAsTextBut(but);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while(get_mbut() & L_MOUSE) BIF_wait_for_statechange();
|
|
|
|
|
|
2003-07-07 15:50:44 +00:00
|
|
|
ui_draw_but(but);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
/* hsv patch */
|
|
|
|
|
if(but->type==HSVSLI) {
|
|
|
|
|
|
|
|
|
|
if(but->str[0]=='H') {
|
|
|
|
|
ui_draw_but(but->next);
|
|
|
|
|
ui_draw_but(but->next->next);
|
|
|
|
|
}
|
|
|
|
|
else if(but->str[0]=='S') {
|
|
|
|
|
ui_draw_but(but->next);
|
|
|
|
|
ui_draw_but(but->prev);
|
|
|
|
|
}
|
|
|
|
|
else if(but->str[0]=='V') {
|
|
|
|
|
ui_draw_but(but->prev);
|
|
|
|
|
ui_draw_but(but->prev->prev);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_BLOCK(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
uiBut *bt;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
but->flag |= UI_SELECT;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
2003-10-23 22:28:49 +00:00
|
|
|
block= but->block_func(but->poin);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-21 07:02:04 +00:00
|
|
|
block->xofs = -2; /* for proper alignment */
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
|
|
|
|
|
/* only used for automatic toolbox, so can set the shift flag */
|
|
|
|
|
if(but->flag & UI_MAKE_TOP) {
|
|
|
|
|
block->direction= UI_TOP|UI_SHIFT_FLIPPED;
|
|
|
|
|
uiBlockFlipOrder(block);
|
|
|
|
|
}
|
|
|
|
|
if(but->flag & UI_MAKE_DOWN) block->direction= UI_DOWN|UI_SHIFT_FLIPPED;
|
|
|
|
|
if(but->flag & UI_MAKE_LEFT) block->direction |= UI_LEFT;
|
|
|
|
|
if(but->flag & UI_MAKE_RIGHT) block->direction |= UI_RIGHT;
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
ui_positionblock(block, but);
|
|
|
|
|
block->flag |= UI_BLOCK_LOOP;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
|
|
|
|
|
/* blocks can come from a normal window, but we go to screenspace */
|
2002-10-12 11:37:38 +00:00
|
|
|
block->win= G.curscreen->mainwin;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
for(bt= block->buttons.first; bt; bt= bt->next) bt->win= block->win;
|
|
|
|
|
bwin_getsinglematrix(block->win, block->winmat);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* postpone draw, this will cause a new window matrix, first finish all other buttons */
|
|
|
|
|
block->flag |= UI_BLOCK_REDRAW;
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_SELECT;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
uibut_do_func(but);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_BUTM(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
ui_set_but_val(but, but->min);
|
|
|
|
|
UIafterfunc= but->butm_func;
|
|
|
|
|
UIafterfunc_arg= but->butm_func_arg;
|
|
|
|
|
UIafterval= but->a2;
|
|
|
|
|
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_LABEL(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
uibut_do_func(but);
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uiBut *ui_get_valid_link_button(uiBlock *block, uiBut *but, short *mval)
|
|
|
|
|
{
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
|
|
|
|
|
/* find button to link to */
|
|
|
|
|
for (bt= block->buttons.first; bt; bt= bt->next)
|
|
|
|
|
if(bt!=but && uibut_contains_pt(bt, mval))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (bt) {
|
|
|
|
|
if (but->type==LINK && bt->type==INLINK) {
|
|
|
|
|
if( but->link->tocode == (int)bt->min ) {
|
|
|
|
|
return bt;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(but->type==INLINK && bt->type==LINK) {
|
|
|
|
|
if( bt->link->tocode == (int)but->min ) {
|
|
|
|
|
return bt;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_is_a_link(uiBut *from, uiBut *to)
|
|
|
|
|
{
|
|
|
|
|
uiLinkLine *line;
|
|
|
|
|
uiLink *link;
|
|
|
|
|
|
|
|
|
|
link= from->link;
|
|
|
|
|
if(link) {
|
|
|
|
|
line= link->lines.first;
|
|
|
|
|
while(line) {
|
|
|
|
|
if(line->from==from && line->to==to) return 1;
|
|
|
|
|
line= line->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uiBut *ui_find_inlink(uiBlock *block, void *poin)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type==INLINK) {
|
|
|
|
|
if(but->poin == poin) return but;
|
|
|
|
|
}
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_add_link_line(ListBase *listb, uiBut *but, uiBut *bt)
|
|
|
|
|
{
|
|
|
|
|
uiLinkLine *line;
|
|
|
|
|
|
|
|
|
|
line= MEM_callocN(sizeof(uiLinkLine), "linkline");
|
|
|
|
|
BLI_addtail(listb, line);
|
|
|
|
|
line->from= but;
|
|
|
|
|
line->to= bt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void uiComposeLinks(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but, *bt;
|
|
|
|
|
uiLink *link;
|
|
|
|
|
void ***ppoin;
|
|
|
|
|
int a;
|
|
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type==LINK) {
|
|
|
|
|
link= but->link;
|
|
|
|
|
|
|
|
|
|
/* for all pointers in the array */
|
|
|
|
|
if(link) {
|
|
|
|
|
if(link->ppoin) {
|
|
|
|
|
ppoin= link->ppoin;
|
|
|
|
|
for(a=0; a < *(link->totlink); a++) {
|
|
|
|
|
bt= ui_find_inlink(block, (*ppoin)[a] );
|
|
|
|
|
if(bt) {
|
|
|
|
|
ui_add_link_line(&link->lines, but, bt);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(link->poin) {
|
|
|
|
|
bt= ui_find_inlink(block, *(link->poin) );
|
|
|
|
|
if(bt) {
|
|
|
|
|
ui_add_link_line(&link->lines, but, bt);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_add_link(uiBut *from, uiBut *to)
|
|
|
|
|
{
|
|
|
|
|
/* in 'from' we have to add a link to 'to' */
|
|
|
|
|
uiLink *link;
|
|
|
|
|
void **oldppoin;
|
|
|
|
|
int a;
|
|
|
|
|
|
|
|
|
|
if(ui_is_a_link(from, to)) {
|
|
|
|
|
printf("already exists\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
link= from->link;
|
|
|
|
|
|
|
|
|
|
/* are there more pointers allowed? */
|
|
|
|
|
if(link->ppoin) {
|
|
|
|
|
oldppoin= *(link->ppoin);
|
|
|
|
|
|
|
|
|
|
(*(link->totlink))++;
|
|
|
|
|
*(link->ppoin)= MEM_callocN( *(link->totlink)*sizeof(void *), "new link");
|
|
|
|
|
|
|
|
|
|
for(a=0; a< (*(link->totlink))-1; a++) {
|
|
|
|
|
(*(link->ppoin))[a]= oldppoin[a];
|
|
|
|
|
}
|
|
|
|
|
(*(link->ppoin))[a]= to->poin;
|
|
|
|
|
|
|
|
|
|
if(oldppoin) MEM_freeN(oldppoin);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
*(link->poin)= to->poin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ui_do_but_LINK(uiBlock *block, uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* This button only visualizes, the dobutton mode
|
|
|
|
|
* can add a new link, but then the whole system
|
|
|
|
|
* should be redrawn/initialized.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
uiBut *bt=0, *bto=NULL;
|
|
|
|
|
short sval[2], mval[2], mvalo[2], first= 1;
|
|
|
|
|
|
|
|
|
|
uiGetMouse(curarea->win, sval);
|
|
|
|
|
mvalo[0]= sval[0];
|
|
|
|
|
mvalo[1]= sval[1];
|
|
|
|
|
|
|
|
|
|
while (get_mbut() & L_MOUSE) {
|
|
|
|
|
uiGetMouse(curarea->win, mval);
|
|
|
|
|
|
|
|
|
|
if(mval[0]!=mvalo[0] || mval[1]!=mvalo[1] || first) {
|
|
|
|
|
/* clear completely, because of drawbuttons */
|
|
|
|
|
bt= ui_get_valid_link_button(block, but, mval);
|
|
|
|
|
if(bt) {
|
|
|
|
|
bt->flag |= UI_ACTIVE;
|
|
|
|
|
ui_draw_but(bt);
|
|
|
|
|
}
|
|
|
|
|
if(bto && bto!=bt) {
|
|
|
|
|
bto->flag &= ~UI_ACTIVE;
|
|
|
|
|
ui_draw_but(bto);
|
|
|
|
|
}
|
|
|
|
|
bto= bt;
|
|
|
|
|
|
|
|
|
|
if (!first) {
|
|
|
|
|
glutil_draw_front_xor_line(sval[0], sval[1], mvalo[0], mvalo[1]);
|
|
|
|
|
}
|
|
|
|
|
glutil_draw_front_xor_line(sval[0], sval[1], mval[0], mval[1]);
|
|
|
|
|
|
|
|
|
|
mvalo[0]= mval[0];
|
|
|
|
|
mvalo[1]= mval[1];
|
|
|
|
|
|
|
|
|
|
first= 0;
|
|
|
|
|
}
|
|
|
|
|
else BIF_wait_for_statechange();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!first) {
|
|
|
|
|
glutil_draw_front_xor_line(sval[0], sval[1], mvalo[0], mvalo[1]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(bt) {
|
|
|
|
|
if(but->type==LINK) ui_add_link(but, bt);
|
|
|
|
|
else ui_add_link(bt, but);
|
|
|
|
|
|
|
|
|
|
scrarea_queue_winredraw(curarea);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ************************************************ */
|
|
|
|
|
|
|
|
|
|
void uiSetButLock(int val, char *lockstr)
|
|
|
|
|
{
|
|
|
|
|
UIlock |= val;
|
|
|
|
|
if (val) UIlockstr= lockstr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiClearButLock()
|
|
|
|
|
{
|
|
|
|
|
UIlock= 0;
|
|
|
|
|
UIlockstr= NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ********************** NEXT/PREV for arrowkeys etc ************** */
|
|
|
|
|
|
|
|
|
|
static uiBut *ui_but_prev(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
while(but->prev) {
|
|
|
|
|
but= but->prev;
|
|
|
|
|
if(but->type!=LABEL && but->type!=SEPR) return but;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uiBut *ui_but_next(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
while(but->next) {
|
|
|
|
|
but= but->next;
|
|
|
|
|
if(but->type!=LABEL && but->type!=SEPR) return but;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uiBut *ui_but_first(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type!=LABEL && but->type!=SEPR) return but;
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uiBut *ui_but_last(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
|
|
|
|
|
but= block->buttons.last;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type!=LABEL && but->type!=SEPR) return but;
|
|
|
|
|
but= but->prev;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* *************************************************************** */
|
|
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
static void setup_file(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
|
|
fp= fopen("butsetup","w");
|
|
|
|
|
if(fp==NULL);
|
|
|
|
|
else {
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
// if(but->rt[3]==1) {
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
fprintf(fp,"%d,%d,%d,%d %s %s\n", (int)but->x1, (int)but->y1, (int)( but->x2-but->x1), (int)(but->y2-but->y1), but->str, but->tip);
|
|
|
|
|
// }
|
2003-10-04 20:35:50 +00:00
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
fclose(fp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void edit_but(uiBlock *block, uiBut *but, uiEvent *uevent)
|
|
|
|
|
{
|
|
|
|
|
short dx, dy, mval[2], mvalo[2], didit=0;
|
|
|
|
|
|
|
|
|
|
getmouseco_sc(mvalo);
|
|
|
|
|
while(TRUE) {
|
|
|
|
|
if( !(get_mbut() & L_MOUSE) ) break;
|
|
|
|
|
|
|
|
|
|
getmouseco_sc(mval);
|
2003-10-11 11:28:24 +00:00
|
|
|
dx= (mval[0]-mvalo[0]);
|
|
|
|
|
dy= (mval[1]-mvalo[1]);
|
2003-10-04 20:35:50 +00:00
|
|
|
|
|
|
|
|
if(dx!=0 || dy!=0) {
|
|
|
|
|
mvalo[0]= mval[0];
|
|
|
|
|
mvalo[1]= mval[1];
|
|
|
|
|
|
|
|
|
|
cpack(0xc0c0c0);
|
|
|
|
|
glRectf(but->x1-2, but->y1-2, but->x2+2, but->y2+2);
|
|
|
|
|
|
|
|
|
|
if((uevent->qual & LR_SHIFTKEY)==0) {
|
|
|
|
|
but->x1 += dx;
|
|
|
|
|
but->y1 += dy;
|
|
|
|
|
}
|
|
|
|
|
but->x2 += dx;
|
|
|
|
|
but->y2 += dy;
|
|
|
|
|
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
glFinish();
|
|
|
|
|
didit= 1;
|
|
|
|
|
but->rt[3]= 1;
|
2003-12-07 06:05:08 +00:00
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
}
|
|
|
|
|
/* idle for this poor code */
|
|
|
|
|
else PIL_sleep_ms(30);
|
|
|
|
|
}
|
|
|
|
|
if(didit) setup_file(block);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
/* is called when LEFTMOUSE is pressed or released
|
|
|
|
|
* return: butval or zero
|
|
|
|
|
*/
|
|
|
|
|
static int ui_do_button(uiBlock *block, uiBut *but, uiEvent *uevent)
|
|
|
|
|
{
|
|
|
|
|
int retval= 0;
|
|
|
|
|
|
|
|
|
|
if(but->lock) {
|
|
|
|
|
if (but->lockstr) {
|
|
|
|
|
error("%s", but->lockstr);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2003-10-04 20:35:50 +00:00
|
|
|
if( but->pointype ) { /* there's a pointer needed */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(but->poin==0 ) {
|
|
|
|
|
printf("DoButton pointer error: %s\n",but->str);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-10-04 20:35:50 +00:00
|
|
|
|
|
|
|
|
if(G.rt==1 && (uevent->qual & LR_CTRLKEY)) {
|
|
|
|
|
edit_but(block, but, uevent);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
block->flag |= UI_BLOCK_BUSY;
|
|
|
|
|
|
|
|
|
|
switch(but->type) {
|
|
|
|
|
case BUT:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_BUT(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case KEYEVT:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_KEYEVT(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TOG:
|
|
|
|
|
case TOGR:
|
|
|
|
|
case ICONTOG:
|
|
|
|
|
case TOGN:
|
|
|
|
|
if(uevent->val) {
|
|
|
|
|
retval= ui_do_but_TOG(block, but);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ROW:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_ROW(block, but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SCROLL:
|
|
|
|
|
/* DrawBut(b, 1); */
|
|
|
|
|
/* do_scrollbut(b); */
|
|
|
|
|
/* DrawBut(b,0); */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case NUM:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_NUM(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SLI:
|
|
|
|
|
case NUMSLI:
|
|
|
|
|
case HSVSLI:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_NUMSLI(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LABEL:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_LABEL(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TOG3:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_TOG3(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TEX:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_TEX(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case MENU:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_MENU(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ICONROW:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_ICONROW(but);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-05-10 10:36:14 +00:00
|
|
|
case ICONTEXTROW:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_ICONTEXTROW(but);
|
|
|
|
|
break;
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
case IDPOIN:
|
|
|
|
|
if(uevent->val) retval= ui_do_but_IDPOIN(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BLOCK:
|
2003-10-07 22:55:16 +00:00
|
|
|
if(uevent->val) {
|
|
|
|
|
retval= ui_do_but_BLOCK(but);
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if(block->auto_open==0) block->auto_open= 1;
|
2003-10-07 22:55:16 +00:00
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BUTM:
|
|
|
|
|
retval= ui_do_but_BUTM(but);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LINK:
|
|
|
|
|
case INLINK:
|
|
|
|
|
retval= ui_do_but_LINK(block, but);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
block->flag &= ~UI_BLOCK_BUSY;
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_delete_active_linkline(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
uiLink *link;
|
|
|
|
|
uiLinkLine *line, *nline;
|
|
|
|
|
int a, b;
|
|
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type==LINK && but->link) {
|
|
|
|
|
line= but->link->lines.first;
|
|
|
|
|
while(line) {
|
|
|
|
|
|
|
|
|
|
nline= line->next;
|
|
|
|
|
|
|
|
|
|
if(line->flag & UI_SELECT) {
|
|
|
|
|
BLI_remlink(&but->link->lines, line);
|
|
|
|
|
|
|
|
|
|
link= line->from->link;
|
|
|
|
|
|
|
|
|
|
/* are there more pointers allowed? */
|
|
|
|
|
if(link->ppoin) {
|
|
|
|
|
|
|
|
|
|
if(*(link->totlink)==1) {
|
|
|
|
|
*(link->totlink)= 0;
|
|
|
|
|
MEM_freeN(*(link->ppoin));
|
|
|
|
|
*(link->ppoin)= NULL;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
b= 0;
|
|
|
|
|
for(a=0; a< (*(link->totlink)); a++) {
|
|
|
|
|
|
|
|
|
|
if( (*(link->ppoin))[a] != line->to->poin ) {
|
|
|
|
|
(*(link->ppoin))[b]= (*(link->ppoin))[a];
|
|
|
|
|
b++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
(*(link->totlink))--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
*(link->poin)= NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MEM_freeN(line);
|
|
|
|
|
}
|
|
|
|
|
line= nline;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* temporal! these buttons can be everywhere... */
|
2003-10-07 18:24:02 +00:00
|
|
|
allqueue(REDRAWBUTSLOGIC, 0);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_do_active_linklines(uiBlock *block, short *mval)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
2003-06-20 12:49:36 +00:00
|
|
|
uiLinkLine *line, *act= NULL;
|
2002-10-12 11:37:38 +00:00
|
|
|
float mindist= 12.0, fac, v1[2], v2[2], v3[3];
|
2003-06-20 12:49:36 +00:00
|
|
|
int foundone= 0;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
if(mval) {
|
|
|
|
|
v1[0]= mval[0];
|
|
|
|
|
v1[1]= mval[1];
|
|
|
|
|
|
|
|
|
|
/* find a line close to the mouse */
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type==LINK && but->link) {
|
2003-06-20 12:49:36 +00:00
|
|
|
foundone= 1;
|
2002-10-12 11:37:38 +00:00
|
|
|
line= but->link->lines.first;
|
|
|
|
|
while(line) {
|
|
|
|
|
v2[0]= line->from->x2;
|
|
|
|
|
v2[1]= (line->from->y1+line->from->y2)/2.0;
|
|
|
|
|
v3[0]= line->to->x1;
|
|
|
|
|
v3[1]= (line->to->y1+line->to->y2)/2.0;
|
|
|
|
|
|
|
|
|
|
fac= PdistVL2Dfl(v1, v2, v3);
|
|
|
|
|
if(fac < mindist) {
|
|
|
|
|
mindist= fac;
|
|
|
|
|
act= line;
|
|
|
|
|
}
|
|
|
|
|
line= line->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-06-20 12:49:36 +00:00
|
|
|
|
|
|
|
|
/* check for a 'found one' to prevent going to 'frontbuffer' mode.
|
|
|
|
|
this slows done gfx quite some, and at OSX the 'finish' forces a swapbuffer */
|
|
|
|
|
if(foundone) {
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-06-20 12:49:36 +00:00
|
|
|
/* draw */
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->type==LINK && but->link) {
|
|
|
|
|
line= but->link->lines.first;
|
|
|
|
|
while(line) {
|
|
|
|
|
if(line==act) {
|
|
|
|
|
if((line->flag & UI_SELECT)==0) {
|
|
|
|
|
line->flag |= UI_SELECT;
|
2003-07-07 15:50:44 +00:00
|
|
|
ui_draw_linkline(but, line);
|
2003-06-20 12:49:36 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(line->flag & UI_SELECT) {
|
|
|
|
|
line->flag &= ~UI_SELECT;
|
2003-07-07 15:50:44 +00:00
|
|
|
ui_draw_linkline(but, line);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2003-06-20 12:49:36 +00:00
|
|
|
line= line->next;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
2003-06-20 12:49:36 +00:00
|
|
|
but= but->next;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-06 14:16:31 +00:00
|
|
|
/* only to be used to prevent an 'outside' event when using nested pulldowns */
|
|
|
|
|
/* four checks:
|
|
|
|
|
- while mouse moves in good x direction
|
|
|
|
|
- while mouse motion x is bigger than y motion
|
|
|
|
|
- while distance to center block diminishes
|
|
|
|
|
- only for 1 second
|
|
|
|
|
|
|
|
|
|
return 0: check outside
|
|
|
|
|
*/
|
|
|
|
|
static int ui_mouse_motion_towards_block(uiBlock *block, uiEvent *uevent)
|
|
|
|
|
{
|
|
|
|
|
short mvalo[2], dx, dy, domx, domy, x1, y1;
|
|
|
|
|
int disto, dist, counter=0;
|
|
|
|
|
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if((block->direction & UI_TOP) || (block->direction & UI_DOWN)) return 0;
|
2003-10-06 14:16:31 +00:00
|
|
|
if(uevent->event!= MOUSEX && uevent->event!= MOUSEY) return 0;
|
|
|
|
|
|
|
|
|
|
/* calculate dominant direction */
|
|
|
|
|
domx= ( -uevent->mval[0] + (block->maxx+block->minx)/2 );
|
|
|
|
|
domy= ( -uevent->mval[1] + (block->maxy+block->miny)/2 );
|
|
|
|
|
/* we need some accuracy */
|
|
|
|
|
if( abs(domx)<4 ) return 0;
|
|
|
|
|
|
|
|
|
|
/* calculte old dist */
|
|
|
|
|
disto= domx*domx + domy*domy;
|
|
|
|
|
|
|
|
|
|
uiGetMouse(mywinget(), mvalo);
|
|
|
|
|
|
|
|
|
|
while(TRUE) {
|
|
|
|
|
uiGetMouse(mywinget(), uevent->mval);
|
|
|
|
|
|
|
|
|
|
/* check inside, if so return */
|
|
|
|
|
if( block->minx <= uevent->mval[0] && block->maxx >= uevent->mval[0] ) {
|
|
|
|
|
if( block->miny <= uevent->mval[1] && block->maxy >= uevent->mval[1] ) {
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* check direction */
|
|
|
|
|
dx= uevent->mval[0] - mvalo[0];
|
|
|
|
|
dy= uevent->mval[1] - mvalo[1];
|
|
|
|
|
|
|
|
|
|
if( abs(dx)+abs(dy)>4 ) { // threshold
|
|
|
|
|
if( abs(dy) > abs(dx) ) {
|
|
|
|
|
//printf("left because y>x direction\n");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( dx>0 && domx>0);
|
|
|
|
|
else if(dx<0 && domx<0);
|
|
|
|
|
else {
|
|
|
|
|
//printf("left because dominant direction\n");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* check dist */
|
|
|
|
|
x1= ( -uevent->mval[0] + (block->maxx+block->minx)/2 );
|
|
|
|
|
y1= ( -uevent->mval[1] + (block->maxy+block->miny)/2 );
|
|
|
|
|
dist= x1*x1 + y1*y1;
|
|
|
|
|
if(dist > disto) {
|
|
|
|
|
//printf("left because distance\n");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else disto= dist;
|
|
|
|
|
|
|
|
|
|
/* idle for this poor code */
|
|
|
|
|
PIL_sleep_ms(10);
|
|
|
|
|
counter++;
|
|
|
|
|
if(counter > 100) {
|
|
|
|
|
// printf("left because of timer (1 sec)\n");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-23 22:28:49 +00:00
|
|
|
|
|
|
|
|
static void ui_set_ftf_font(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
#ifdef INTERNATIONAL
|
|
|
|
|
if(block->aspect<1.15) {
|
|
|
|
|
FTF_SetFontSize('l');
|
|
|
|
|
}
|
|
|
|
|
else if(block->aspect<1.59) {
|
|
|
|
|
FTF_SetFontSize('m');
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
FTF_SetFontSize('s');
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* return:
|
|
|
|
|
* UI_NOTHING pass event to other ui's
|
|
|
|
|
* UI_CONT don't pass event to other ui's
|
|
|
|
|
* UI_RETURN something happened, return, swallow event
|
|
|
|
|
*/
|
|
|
|
|
static int ui_do_block(uiBlock *block, uiEvent *uevent)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but, *bt;
|
|
|
|
|
int butevent, event, retval=UI_NOTHING, count, act=0;
|
|
|
|
|
int inside= 0, active=0;
|
|
|
|
|
|
|
|
|
|
if(block->win != mywinget()) return UI_NOTHING;
|
|
|
|
|
|
|
|
|
|
/* filter some unwanted events */
|
2003-10-17 16:24:10 +00:00
|
|
|
/* btw: we allow event==0 for first time in menus, draws the hilited item */
|
|
|
|
|
if(uevent==0 || uevent->event==LEFTSHIFTKEY || uevent->event==RIGHTSHIFTKEY) return UI_NOTHING;
|
2003-10-06 10:33:01 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if(block->flag & UI_BLOCK_ENTER_OK) {
|
|
|
|
|
if(uevent->event == RETKEY && uevent->val) {
|
|
|
|
|
// printf("qual: %d %d %d\n", uevent->qual, get_qual(), G.qual);
|
|
|
|
|
if ((G.qual & LR_SHIFTKEY) == 0) {
|
|
|
|
|
return UI_RETURN_OK;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-23 18:25:08 +00:00
|
|
|
ui_set_ftf_font(block); // sets just a pointer in ftf lib... the button dont have ftf handles
|
2003-10-28 14:20:03 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
Mat4CpyMat4(UIwinmat, block->winmat);
|
2003-10-11 00:21:05 +00:00
|
|
|
uiPanelPush(block); // push matrix; no return without pop!
|
2003-10-04 20:35:50 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
uiGetMouse(mywinget(), uevent->mval); /* transformed mouseco */
|
|
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
/* check boundbox and panel events */
|
2002-10-12 11:37:38 +00:00
|
|
|
if( block->minx <= uevent->mval[0] && block->maxx >= uevent->mval[0] ) {
|
2003-10-16 00:17:24 +00:00
|
|
|
// inside block
|
|
|
|
|
if( block->miny <= uevent->mval[1] && block->maxy >= uevent->mval[1] ) inside= 1;
|
2003-10-05 13:19:08 +00:00
|
|
|
|
2003-10-16 00:17:24 +00:00
|
|
|
if(block->panel && block->panel->paneltab==NULL) {
|
|
|
|
|
|
2003-10-14 10:45:35 +00:00
|
|
|
/* clicked at panel header? */
|
2003-10-16 00:17:24 +00:00
|
|
|
if( block->panel->flag & PNL_CLOSEDX) {
|
|
|
|
|
if(block->minx <= uevent->mval[0] && block->minx+PNL_HEADER >= uevent->mval[0])
|
2003-10-14 10:45:35 +00:00
|
|
|
inside= 2;
|
2003-10-04 20:35:50 +00:00
|
|
|
}
|
2003-10-16 00:17:24 +00:00
|
|
|
else if( (block->maxy <= uevent->mval[1]) && (block->maxy+PNL_HEADER >= uevent->mval[1]) )
|
|
|
|
|
inside= 2;
|
2003-10-15 12:26:26 +00:00
|
|
|
|
2003-10-16 00:17:24 +00:00
|
|
|
if(inside) { // this stuff should move to do_panel
|
|
|
|
|
|
|
|
|
|
if(uevent->event==LEFTMOUSE) {
|
|
|
|
|
if(inside==2) {
|
|
|
|
|
uiPanelPop(block); // pop matrix; no return without pop!
|
|
|
|
|
ui_do_panel(block, uevent);
|
|
|
|
|
return UI_EXIT_LOOP; // exit loops because of moving panels
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(uevent->event==ESCKEY) {
|
|
|
|
|
if(block->handler) {
|
|
|
|
|
rem_blockhandler(curarea, block->handler);
|
|
|
|
|
addqueue(curarea->win, REDRAW, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(uevent->event==PADPLUSKEY || uevent->event==PADMINUS) {
|
|
|
|
|
SpaceLink *sl= curarea->spacedata.first;
|
2003-10-22 09:06:30 +00:00
|
|
|
if(curarea->spacetype!=SPACE_BUTS) {
|
|
|
|
|
if(uevent->event==PADPLUSKEY) sl->blockscale+= 0.1;
|
|
|
|
|
else sl->blockscale-= 0.1;
|
|
|
|
|
CLAMP(sl->blockscale, 0.6, 1.0);
|
|
|
|
|
addqueue(block->winq, REDRAW, 1);
|
|
|
|
|
retval= UI_CONT;
|
|
|
|
|
}
|
2003-10-16 00:17:24 +00:00
|
|
|
}
|
2003-10-15 12:26:26 +00:00
|
|
|
}
|
2003-10-04 20:35:50 +00:00
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2003-10-04 20:35:50 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
switch(uevent->event) {
|
2004-01-23 20:54:26 +00:00
|
|
|
case LEFTARROWKEY: // later on implement opening/closing sublevels of pupmenus
|
|
|
|
|
case RIGHTARROWKEY:
|
|
|
|
|
break;
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
case PAD8: case PAD2:
|
|
|
|
|
case UPARROWKEY:
|
|
|
|
|
case DOWNARROWKEY:
|
|
|
|
|
if(inside || (block->flag & UI_BLOCK_LOOP)) {
|
|
|
|
|
/* arrowkeys: only handle for block_loop blocks */
|
|
|
|
|
event= 0;
|
|
|
|
|
if(block->flag & UI_BLOCK_LOOP) {
|
|
|
|
|
event= uevent->event;
|
|
|
|
|
if(event==PAD8) event= UPARROWKEY;
|
|
|
|
|
if(event==PAD2) event= DOWNARROWKEY;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(uevent->event==PAD8) event= UPARROWKEY;
|
|
|
|
|
if(uevent->event==PAD2) event= DOWNARROWKEY;
|
|
|
|
|
}
|
|
|
|
|
if(event && uevent->val) {
|
|
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_MOUSE_OVER;
|
|
|
|
|
|
|
|
|
|
if(but->flag & UI_ACTIVE) {
|
|
|
|
|
but->flag &= ~UI_ACTIVE;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
|
2004-01-23 20:54:26 +00:00
|
|
|
if(event==UPARROWKEY) {
|
|
|
|
|
if(block->direction & UI_TOP) bt= ui_but_next(but);
|
|
|
|
|
else bt= ui_but_prev(but);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2004-01-23 20:54:26 +00:00
|
|
|
else {
|
|
|
|
|
if(block->direction & UI_TOP) bt= ui_but_prev(but);
|
|
|
|
|
else bt= ui_but_next(but);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(bt) {
|
2002-10-12 11:37:38 +00:00
|
|
|
bt->flag |= UI_ACTIVE;
|
|
|
|
|
ui_draw_but(bt);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* nothing done */
|
|
|
|
|
if(but==NULL) {
|
|
|
|
|
|
2004-01-23 20:54:26 +00:00
|
|
|
if(event==UPARROWKEY) {
|
|
|
|
|
if(block->direction & UI_TOP) but= ui_but_first(block);
|
|
|
|
|
else but= ui_but_last(block);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(block->direction & UI_TOP) but= ui_but_last(block);
|
|
|
|
|
else but= ui_but_first(block);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
if(but) {
|
|
|
|
|
but->flag |= UI_ACTIVE;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
retval= UI_CONT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ONEKEY: act= 1;
|
|
|
|
|
case TWOKEY: if(act==0) act= 2;
|
|
|
|
|
case THREEKEY: if(act==0) act= 3;
|
|
|
|
|
case FOURKEY: if(act==0) act= 4;
|
|
|
|
|
case FIVEKEY: if(act==0) act= 5;
|
|
|
|
|
case SIXKEY: if(act==0) act= 6;
|
|
|
|
|
case SEVENKEY: if(act==0) act= 7;
|
|
|
|
|
case EIGHTKEY: if(act==0) act= 8;
|
|
|
|
|
case NINEKEY: if(act==0) act= 9;
|
|
|
|
|
case ZEROKEY: if(act==0) act= 10;
|
|
|
|
|
|
|
|
|
|
if( block->flag & UI_BLOCK_NUMSELECT ) {
|
|
|
|
|
|
|
|
|
|
if(get_qual() & LR_ALTKEY) act+= 10;
|
|
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
count= 0;
|
|
|
|
|
while(but) {
|
2003-11-30 19:18:08 +00:00
|
|
|
int doit= 0;
|
|
|
|
|
|
|
|
|
|
if(but->type!=LABEL && but->type!=SEPR) count++;
|
|
|
|
|
/* exception for menus like layer buts, with button aligning they're not drawn in order */
|
|
|
|
|
if(but->type==TOGR) {
|
|
|
|
|
if(but->bitnr==act-1) doit= 1;
|
|
|
|
|
} else if(count==act) doit=1;
|
|
|
|
|
|
|
|
|
|
if(doit) {
|
2002-10-12 11:37:38 +00:00
|
|
|
but->flag |= UI_ACTIVE;
|
|
|
|
|
if(uevent->val==1) ui_draw_but(but);
|
2003-11-21 13:14:50 +00:00
|
|
|
else if(block->flag & UI_BLOCK_RET_1) { /* to make UI_BLOCK_RET_1 working */
|
2002-10-12 11:37:38 +00:00
|
|
|
uevent->event= RETKEY;
|
2003-11-21 13:14:50 +00:00
|
|
|
uevent->val= 1;
|
|
|
|
|
//addqueue(block->winq, RIGHTARROWKEY, 1); (why! (ton))
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
uevent->event= LEFTMOUSE; /* to make sure the button is handled further on */
|
|
|
|
|
uevent->val= 1;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(but->flag & UI_ACTIVE) {
|
|
|
|
|
but->flag &= ~UI_ACTIVE;
|
|
|
|
|
ui_draw_but(but);
|
|
|
|
|
}
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2004-01-16 21:16:09 +00:00
|
|
|
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
|
|
|
|
|
but->flag &= ~UI_MOUSE_OVER;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2004-01-16 21:16:09 +00:00
|
|
|
/* check boundbox */
|
|
|
|
|
if (uibut_contains_pt(but, uevent->mval)) {
|
|
|
|
|
but->flag |= UI_MOUSE_OVER;
|
|
|
|
|
UIbuttip= but;
|
|
|
|
|
}
|
|
|
|
|
/* hilite case 1 */
|
|
|
|
|
if(but->flag & UI_MOUSE_OVER) {
|
|
|
|
|
if( (but->flag & UI_ACTIVE)==0) {
|
|
|
|
|
but->flag |= UI_ACTIVE;
|
|
|
|
|
if(but->type != LABEL && (but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2004-01-16 21:16:09 +00:00
|
|
|
}
|
|
|
|
|
/* hilite case 2 */
|
|
|
|
|
if(but->flag & UI_ACTIVE) {
|
|
|
|
|
if( (but->flag & UI_MOUSE_OVER)==0) {
|
|
|
|
|
/* 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;
|
2003-10-28 14:20:03 +00:00
|
|
|
if(but->type != LABEL && (but->flag & UI_NO_HILITE)==0) ui_draw_but(but);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
2004-01-16 21:16:09 +00:00
|
|
|
else if(but->type==BLOCK || but->type==MENU) { // automatic opens block button (pulldown)
|
|
|
|
|
int time;
|
|
|
|
|
if(uevent->event!=LEFTMOUSE ) {
|
|
|
|
|
if(block->auto_open==2) time= 1; // test for toolbox
|
|
|
|
|
else if(block->auto_open) time= 5*U.menuthreshold2;
|
|
|
|
|
else if(U.uiflag & USER_MENUOPENAUTO) time= 5*U.menuthreshold1;
|
|
|
|
|
else time= -1;
|
|
|
|
|
|
|
|
|
|
for (; time>0; time--) {
|
|
|
|
|
if (qtest()) break;
|
|
|
|
|
else PIL_sleep_ms(20);
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
}
|
2004-01-16 21:16:09 +00:00
|
|
|
|
|
|
|
|
if(time==0) {
|
|
|
|
|
uevent->val= 1; // otherwise buttons dont react
|
|
|
|
|
ui_do_button(block, but, uevent);
|
2003-10-06 10:33:01 +00:00
|
|
|
}
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2004-01-16 21:16:09 +00:00
|
|
|
if(but->flag & UI_ACTIVE) active= 1;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
2004-01-16 21:16:09 +00:00
|
|
|
but= but->next;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2004-01-16 21:16:09 +00:00
|
|
|
|
|
|
|
|
/* if there are no active buttons... otherwise clear lines */
|
|
|
|
|
if(active) ui_do_active_linklines(block, 0);
|
|
|
|
|
else ui_do_active_linklines(block, uevent->mval);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* middlemouse exception, not for regular blocks */
|
|
|
|
|
if( (block->flag & UI_BLOCK_LOOP) && uevent->event==MIDDLEMOUSE) uevent->event= LEFTMOUSE;
|
|
|
|
|
|
|
|
|
|
/* the final dobutton */
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
if(but->flag & UI_ACTIVE) {
|
|
|
|
|
|
|
|
|
|
/* UI_BLOCK_RET_1: not return when val==0 */
|
|
|
|
|
|
|
|
|
|
if(uevent->val || (block->flag & UI_BLOCK_RET_1)==0) {
|
|
|
|
|
if ELEM3(uevent->event, LEFTMOUSE, PADENTER, RETKEY) {
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
/* when mouse outside, don't do button */
|
|
|
|
|
if(inside || uevent->event!=LEFTMOUSE) {
|
|
|
|
|
butevent= ui_do_button(block, but, uevent);
|
|
|
|
|
if(butevent) addqueue(block->winq, UI_BUT_EVENT, (short)butevent);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
/* i doubt about the next line! */
|
|
|
|
|
/* if(but->func) mywinset(block->win); */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
- The basic layer for Themes in place!
- currently only implemented for 3d window
- create as many themes you like, and name them
- default theme is not editable, and always will be defined at startup
(initTheme)
- saves in .B.blend
- themes for spaces can become local too, so you can set individual
3d windows at theme 'Maya' or so. (to be implemented)
- it uses alpha as well...!
API:
This doesnt use the old method with BFCOLORID blahblah. The API is copied
from OpenGL conventions (naming) as much as possible:
- void BIF_ThemeColor(ScrArea *sa, int colorid)
sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc)
- void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset)
sets a color with offset, no more weird COLORSHADE_LGREY stuff
- void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col)
like opengl, this gives you in *col the three rgb values
- void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col)
or the one to get 4 bytes
ThemeColor calls for globals (UI etc) can also call NULL for *sa... this
is to be implemented still.
Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
|
|
|
if( (block->flag & UI_BLOCK_LOOP) && but->type==BLOCK);
|
|
|
|
|
else
|
|
|
|
|
if(/*but->func ||*/ butevent) retval= UI_RETURN_OK;
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
but= but->next;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-11 00:21:05 +00:00
|
|
|
uiPanelPop(block); // pop matrix; no return without pop!
|
2003-10-04 20:35:50 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* the linkines... why not make buttons from it? Speed? Memory? */
|
|
|
|
|
if(uevent->val && (uevent->event==XKEY || uevent->event==DELKEY))
|
|
|
|
|
ui_delete_active_linkline(block);
|
|
|
|
|
|
|
|
|
|
if(block->flag & UI_BLOCK_LOOP) {
|
|
|
|
|
|
|
|
|
|
if(inside==0 && uevent->val==1) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if ELEM3(uevent->event, LEFTMOUSE, MIDDLEMOUSE, RIGHTMOUSE) {
|
|
|
|
|
if(BLI_in_rctf(&block->parentrct, (float)uevent->mval[0], (float)uevent->mval[1]));
|
|
|
|
|
else return UI_RETURN_OUT;
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(uevent->event==ESCKEY && uevent->val==1) return UI_RETURN_CANCEL;
|
2003-01-29 11:28:15 +00:00
|
|
|
|
|
|
|
|
if((uevent->event==RETKEY || uevent->event==PADENTER) && uevent->val==1) return UI_RETURN_OK;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
/* check outside */
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if(inside==0) {
|
2003-10-06 10:33:01 +00:00
|
|
|
/* strict check, and include the parent rect */
|
2003-10-06 14:16:31 +00:00
|
|
|
if( BLI_in_rctf(&block->parentrct, (float)uevent->mval[0], (float)uevent->mval[1]));
|
|
|
|
|
else if( ui_mouse_motion_towards_block(block, uevent));
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
else if( BLI_in_rctf(&block->safety, (float)uevent->mval[0], (float)uevent->mval[1]));
|
|
|
|
|
else return UI_RETURN_OUT;
|
2003-10-06 10:33:01 +00:00
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uiSaveUnder *ui_draw_but_tip(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
uiSaveUnder *su;
|
|
|
|
|
float x1, x2, y1, y2;
|
|
|
|
|
|
2003-05-03 12:17:11 +00:00
|
|
|
#ifdef INTERNATIONAL
|
|
|
|
|
if(G.ui_international == TRUE) {
|
|
|
|
|
float llx,lly,llz,urx,ury,urz; //for FTF_GetBoundingBox()
|
|
|
|
|
|
2004-01-13 14:50:45 +00:00
|
|
|
if(U.transopts & USER_TR_TOOLTIPS) {
|
2003-05-03 12:17:11 +00:00
|
|
|
FTF_GetBoundingBox(but->tip, &llx,&lly,&llz,&urx,&ury,&urz, FTF_USE_GETTEXT | FTF_INPUT_UTF8);
|
|
|
|
|
|
|
|
|
|
x1= (but->x1+but->x2)/2; x2= 10+x1+ but->aspect*FTF_GetStringWidth(but->tip, FTF_USE_GETTEXT | FTF_INPUT_UTF8); //BMF_GetStringWidth(but->font, but->tip);
|
|
|
|
|
y1= but->y1-(ury+FTF_GetSize()); y2= but->y1;
|
|
|
|
|
} else {
|
|
|
|
|
FTF_GetBoundingBox(but->tip, &llx,&lly,&llz,&urx,&ury,&urz, FTF_NO_TRANSCONV | FTF_INPUT_UTF8);
|
|
|
|
|
|
|
|
|
|
x1= (but->x1+but->x2)/2; x2= 10+x1+ but->aspect*FTF_GetStringWidth(but->tip, FTF_NO_TRANSCONV | FTF_INPUT_UTF8); //BMF_GetStringWidth(but->font, but->tip);
|
|
|
|
|
y1= but->y1-(ury+FTF_GetSize()); y2= but->y1;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
x1= (but->x1+but->x2)/2; x2= 10+x1+ but->aspect*BMF_GetStringWidth(but->font, but->tip);
|
|
|
|
|
y1= but->y1-19; y2= but->y1-2;
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
x1= (but->x1+but->x2)/2; x2= 10+x1+ but->aspect*BMF_GetStringWidth(but->font, but->tip);
|
|
|
|
|
y1= but->y1-19; y2= but->y1-2;
|
|
|
|
|
#endif
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
/* for pulldown menus it doesnt work */
|
|
|
|
|
if(mywinget()==G.curscreen->mainwin);
|
|
|
|
|
else {
|
|
|
|
|
ui_graphics_to_window(mywinget(), &x1, &y1);
|
|
|
|
|
ui_graphics_to_window(mywinget(), &x2, &y2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(x2 > G.curscreen->sizex) {
|
|
|
|
|
x1 -= x2-G.curscreen->sizex;
|
|
|
|
|
x2= G.curscreen->sizex;
|
|
|
|
|
}
|
|
|
|
|
if(y1 < 0) {
|
|
|
|
|
y1 += 36;
|
|
|
|
|
y2 += 36;
|
|
|
|
|
}
|
|
|
|
|
|
2003-05-09 11:39:37 +00:00
|
|
|
// adjust tooltip heights
|
|
|
|
|
if(mywinget()==G.curscreen->mainwin)
|
|
|
|
|
y2 -= G.ui_international ? 4:1; //tip is from pulldownmenu
|
|
|
|
|
else if(curarea->win != mywinget())
|
|
|
|
|
y2 -= G.ui_international ? 5:1; //tip is from a windowheader
|
|
|
|
|
// else y2 += 1; //tip is from button area
|
|
|
|
|
|
2003-10-29 19:23:51 +00:00
|
|
|
su= ui_bgnpupdraw((int)(x1-1), (int)(y1-2), (int)(x2+4), (int)(y2+4), 0);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-10-20 04:05:31 +00:00
|
|
|
|
|
|
|
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
|
|
|
|
|
glColor4ub(0, 0, 0, 20);
|
|
|
|
|
|
2003-12-07 06:05:08 +00:00
|
|
|
glBegin(GL_POLYGON);
|
|
|
|
|
gl_round_box(x1+3, y1-1, x2+1, y2-2, 2.0);
|
|
|
|
|
gl_round_box(x1+3, y1-2, x2+2, y2-2, 3.0);
|
|
|
|
|
|
|
|
|
|
glColor4ub(0, 0, 0, 8);
|
2003-10-20 04:05:31 +00:00
|
|
|
|
2003-12-08 10:48:28 +00:00
|
|
|
gl_round_box(x1+3, y1-3, x2+3, y2-3, 4.0);
|
|
|
|
|
gl_round_box(x1+3, y1-4, x2+4, y2-3, 5.0);
|
2003-12-07 06:05:08 +00:00
|
|
|
glEnd();
|
2003-10-20 04:05:31 +00:00
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
|
|
|
|
|
glColor3ub(0xFF, 0xFF, 0xDD);
|
|
|
|
|
glRectf(x1, y1, x2, y2);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
glColor3ub(0,0,0);
|
|
|
|
|
glRasterPos2f( x1+3, y1+4);
|
2004-01-13 14:50:45 +00:00
|
|
|
BIF_DrawString(but->font, but->tip, (U.transopts & USER_TR_TOOLTIPS));
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-07-07 15:50:44 +00:00
|
|
|
glFinish(); /* to show it in the frontbuffer */
|
2002-10-12 11:37:38 +00:00
|
|
|
return su;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_do_but_tip(void)
|
|
|
|
|
{
|
|
|
|
|
uiSaveUnder *su;
|
|
|
|
|
int time;
|
|
|
|
|
|
|
|
|
|
if (UIbuttip && UIbuttip->tip && UIbuttip->tip[0]) {
|
|
|
|
|
/* Pause for a moment to see if we
|
|
|
|
|
* should really display the tip
|
|
|
|
|
* or if the user will keep moving
|
|
|
|
|
* the pointer.
|
|
|
|
|
*/
|
|
|
|
|
for (time= 0; time<10; time++) {
|
|
|
|
|
if (anyqtest())
|
|
|
|
|
return;
|
|
|
|
|
else
|
2003-10-04 20:35:50 +00:00
|
|
|
PIL_sleep_ms(50);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Display the tip, and keep it displayed
|
|
|
|
|
* as long as the mouse remains on top
|
|
|
|
|
* of the button that owns it.
|
|
|
|
|
*/
|
2003-10-11 00:21:05 +00:00
|
|
|
uiPanelPush(UIbuttip->block); // panel matrix
|
2002-10-12 11:37:38 +00:00
|
|
|
su= ui_draw_but_tip(UIbuttip);
|
|
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
|
char ascii;
|
|
|
|
|
short val;
|
|
|
|
|
unsigned short evt= extern_qread_ext(&val, &ascii);
|
|
|
|
|
|
|
|
|
|
if (evt==MOUSEX || evt==MOUSEY) {
|
|
|
|
|
short mouse[2];
|
|
|
|
|
uiGetMouse(su->oldwin, mouse);
|
|
|
|
|
|
|
|
|
|
if (!uibut_contains_pt(UIbuttip, mouse))
|
|
|
|
|
break;
|
|
|
|
|
} else {
|
|
|
|
|
mainqpushback(evt, val, ascii);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ui_endpupdraw(su);
|
2003-10-11 00:21:05 +00:00
|
|
|
uiPanelPop(UIbuttip->block); // panel matrix
|
2002-10-12 11:37:38 +00:00
|
|
|
UIbuttip= NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* returns UI_NOTHING, if nothing happened */
|
|
|
|
|
int uiDoBlocks(ListBase *lb, int event)
|
|
|
|
|
{
|
|
|
|
|
/* return when: firstblock != BLOCK_LOOP
|
|
|
|
|
*
|
2003-07-18 18:32:57 +00:00
|
|
|
* 'cont' is used to make sure you can press another button while a looping menu
|
2002-10-12 11:37:38 +00:00
|
|
|
* is active. otherwise you have to press twice...
|
|
|
|
|
*/
|
|
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
uiBlock *block, *first;
|
2002-10-12 11:37:38 +00:00
|
|
|
uiEvent uevent;
|
2003-12-24 11:44:57 +00:00
|
|
|
int retval= UI_NOTHING, cont= 1;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
if(lb->first==0) return UI_NOTHING;
|
2003-10-06 10:33:01 +00:00
|
|
|
|
|
|
|
|
/* for every pixel both x and y events are generated, overloads the system! */
|
|
|
|
|
if(event==MOUSEX) return UI_NOTHING;
|
2003-07-07 15:50:44 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
UIbuttip= NULL;
|
|
|
|
|
UIafterfunc= NULL; /* to prevent infinite loops, this shouldnt be a global! */
|
|
|
|
|
|
|
|
|
|
uevent.qual= G.qual;
|
|
|
|
|
uevent.event= event;
|
|
|
|
|
uevent.val= 1;
|
|
|
|
|
|
2003-07-07 15:50:44 +00:00
|
|
|
/* this is a caching mechanism, to prevent too many calls to glFrontBuffer and glFinish, which slows down interface */
|
|
|
|
|
block= lb->first;
|
|
|
|
|
while(block) {
|
|
|
|
|
block->frontbuf= UI_NEED_DRAW_FRONT; // signal
|
|
|
|
|
block= block->next;
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-18 18:32:57 +00:00
|
|
|
/* main loop, needed when you click outside a looping block (menu) then it uses that
|
|
|
|
|
event to immediately evaluate the other uiBlocks again. */
|
2002-10-12 11:37:38 +00:00
|
|
|
while(cont) {
|
2003-07-18 18:32:57 +00:00
|
|
|
|
|
|
|
|
/* first loop, for the normal blocks */
|
2002-10-12 11:37:38 +00:00
|
|
|
block= lb->first;
|
|
|
|
|
while(block) {
|
2003-10-04 20:35:50 +00:00
|
|
|
|
2003-07-18 18:32:57 +00:00
|
|
|
/* for pupmenus, the bgnpupdraw sets (and later restores) the active
|
|
|
|
|
window. Then mousecoords get transformed OK.
|
|
|
|
|
It looks double... but a call to ui_do_block otherwise doesnt get handled properly
|
|
|
|
|
*/
|
2002-10-12 11:37:38 +00:00
|
|
|
if(block->flag & UI_BLOCK_REDRAW) {
|
|
|
|
|
if( block->flag & UI_BLOCK_LOOP) {
|
2003-10-04 20:35:50 +00:00
|
|
|
block->saveunder= ui_bgnpupdraw((int)block->minx-1, (int)block->miny-6, (int)block->maxx+6, (int)block->maxy+1, 1);
|
2003-07-07 15:50:44 +00:00
|
|
|
block->frontbuf= UI_HAS_DRAW_FRONT;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
uiDrawBlock(block);
|
|
|
|
|
block->flag &= ~UI_BLOCK_REDRAW;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
retval= ui_do_block(block, &uevent);
|
2003-10-04 20:35:50 +00:00
|
|
|
if(retval==UI_EXIT_LOOP) break;
|
2003-07-18 18:32:57 +00:00
|
|
|
|
|
|
|
|
/* now a new block could be created for menus, this is
|
|
|
|
|
inserted in the beginning of a list */
|
|
|
|
|
|
|
|
|
|
/* is there a glfinish cached? */
|
2003-07-07 15:50:44 +00:00
|
|
|
if(block->frontbuf == UI_HAS_DRAW_FRONT) {
|
|
|
|
|
glFinish();
|
|
|
|
|
glDrawBuffer(GL_BACK);
|
|
|
|
|
block->frontbuf= UI_NEED_DRAW_FRONT;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
/* to make sure the matrix of the panel works for menus too */
|
|
|
|
|
if(retval==UI_CONT || (retval & UI_RETURN)) break;
|
|
|
|
|
first= lb->first; if(first->flag & UI_BLOCK_LOOP) break;
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
block= block->next;
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-18 18:32:57 +00:00
|
|
|
/* second loop, for menus (looping blocks). works for sub->menus too */
|
2002-10-12 11:37:38 +00:00
|
|
|
block= lb->first;
|
|
|
|
|
if(block==NULL || (block->flag & UI_BLOCK_LOOP)==0) cont= 0;
|
2003-07-18 18:32:57 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
while( (block= lb->first) && (block->flag & UI_BLOCK_LOOP)) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if(block->auto_open==0) block->auto_open= 1;
|
2003-10-07 22:55:16 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* this here, for menu buts */
|
|
|
|
|
if(block->flag & UI_BLOCK_REDRAW) {
|
|
|
|
|
|
|
|
|
|
if( block->flag & UI_BLOCK_LOOP) {
|
2003-10-06 10:33:01 +00:00
|
|
|
block->saveunder= ui_bgnpupdraw((int)block->minx-1, (int)block->miny-6, (int)block->maxx+6, (int)block->maxy+1, 1);
|
2003-07-07 15:50:44 +00:00
|
|
|
block->frontbuf= UI_HAS_DRAW_FRONT;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
uiDrawBlock(block);
|
|
|
|
|
block->flag &= ~UI_BLOCK_REDRAW;
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-07 15:50:44 +00:00
|
|
|
/* need to reveil drawing? (not in end of loop, because of free block */
|
|
|
|
|
if(block->frontbuf == UI_HAS_DRAW_FRONT) {
|
|
|
|
|
glFinish();
|
|
|
|
|
block->frontbuf= UI_NEED_DRAW_FRONT;
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
uevent.event= extern_qread(&uevent.val);
|
|
|
|
|
|
|
|
|
|
if(uevent.event) {
|
|
|
|
|
|
|
|
|
|
retval= ui_do_block(block, &uevent);
|
|
|
|
|
|
|
|
|
|
if(retval & UI_RETURN) {
|
|
|
|
|
/* free this block */
|
|
|
|
|
ui_endpupdraw(block->saveunder);
|
|
|
|
|
|
|
|
|
|
BLI_remlink(lb, block);
|
|
|
|
|
uiFreeBlock(block);
|
|
|
|
|
}
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
if(retval & (UI_RETURN_OK|UI_RETURN_CANCEL)) {
|
2002-10-12 11:37:38 +00:00
|
|
|
/* free other menus */
|
|
|
|
|
while( (block= lb->first) && (block->flag & UI_BLOCK_LOOP)) {
|
|
|
|
|
ui_endpupdraw(block->saveunder);
|
|
|
|
|
BLI_remlink(lb, block);
|
|
|
|
|
uiFreeBlock(block);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* tooltip */
|
|
|
|
|
if(retval==UI_NOTHING && (uevent.event==MOUSEX || uevent.event==MOUSEY)) {
|
2004-01-13 14:50:45 +00:00
|
|
|
if(U.flag & USER_TOOLTIPS) ui_do_but_tip();
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
2003-07-18 18:32:57 +00:00
|
|
|
|
|
|
|
|
/* else it does the first part of this loop again, maybe another menu needs to be opened */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(retval==UI_CONT || (retval & UI_RETURN_OK)) cont= 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-07 14:08:41 +00:00
|
|
|
/* cleanup frontbuffer & flags */
|
|
|
|
|
block= lb->first;
|
|
|
|
|
while(block) {
|
|
|
|
|
if(block->frontbuf==UI_HAS_DRAW_FRONT) glFinish();
|
|
|
|
|
block->frontbuf= 0;
|
|
|
|
|
block= block->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* afterfunc is used for fileloading too, so after this call, the blocks pointers are invalid */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(retval & UI_RETURN_OK) {
|
|
|
|
|
if(UIafterfunc) UIafterfunc(UIafterfunc_arg, UIafterval);
|
|
|
|
|
UIafterfunc= NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* tooltip */
|
|
|
|
|
if(retval==UI_NOTHING && (uevent.event==MOUSEX || uevent.event==MOUSEY)) {
|
2004-01-13 14:50:45 +00:00
|
|
|
if(U.flag & USER_TOOLTIPS) ui_do_but_tip();
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
2003-07-07 15:50:44 +00:00
|
|
|
/* doesnt harm :-) */
|
|
|
|
|
glDrawBuffer(GL_BACK);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ************** DATA *************** */
|
|
|
|
|
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
double ui_get_but_val(uiBut *but)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
void *poin;
|
|
|
|
|
double value = 0.0;
|
|
|
|
|
|
|
|
|
|
poin= but->poin;
|
|
|
|
|
|
|
|
|
|
if(but->type== HSVSLI) {
|
|
|
|
|
float h, s, v, *fp= (float *) poin;
|
|
|
|
|
|
|
|
|
|
rgb_to_hsv(fp[0], fp[1], fp[2], &h, &s, &v);
|
|
|
|
|
|
|
|
|
|
switch(but->str[0]) {
|
|
|
|
|
case 'H': value= h; break;
|
|
|
|
|
case 'S': value= s; break;
|
|
|
|
|
case 'V': value= v; break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if( but->pointype == CHA ) {
|
|
|
|
|
value= *(char *)poin;
|
|
|
|
|
}
|
|
|
|
|
else if( but->pointype == SHO ) {
|
|
|
|
|
value= *(short *)poin;
|
|
|
|
|
}
|
|
|
|
|
else if( but->pointype == INT ) {
|
|
|
|
|
value= *(int *)poin;
|
|
|
|
|
}
|
|
|
|
|
else if( but->pointype == FLO ) {
|
|
|
|
|
value= *(float *)poin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_set_but_val(uiBut *but, double value)
|
|
|
|
|
{
|
|
|
|
|
void *poin;
|
|
|
|
|
|
|
|
|
|
if(but->pointype==0) return;
|
|
|
|
|
poin= but->poin;
|
|
|
|
|
|
2003-04-30 13:22:26 +00:00
|
|
|
/* value is a hsv value: convert to rgb */
|
2002-10-12 11:37:38 +00:00
|
|
|
if( but->type==HSVSLI ) {
|
|
|
|
|
float h, s, v, *fp= (float *)but->poin;
|
|
|
|
|
|
|
|
|
|
rgb_to_hsv(fp[0], fp[1], fp[2], &h, &s, &v);
|
|
|
|
|
|
|
|
|
|
switch(but->str[0]) {
|
|
|
|
|
case 'H': h= value; break;
|
|
|
|
|
case 'S': s= value; break;
|
|
|
|
|
case 'V': v= value; break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
hsv_to_rgb(h, s, v, fp, fp+1, fp+2);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if( but->pointype==CHA )
|
|
|
|
|
*((char *)poin)= (char)value;
|
2003-02-15 04:18:22 +00:00
|
|
|
else if( but->pointype==SHO ) {
|
|
|
|
|
/* gcc 3.2.1 seems to have problems
|
|
|
|
|
* casting a double like 32772.0 to
|
|
|
|
|
* a short so we cast to an int, then
|
|
|
|
|
to a short */
|
|
|
|
|
int gcckludge;
|
|
|
|
|
gcckludge = (int) value;
|
|
|
|
|
*((short *)poin)= (short) gcckludge;
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
else if( but->pointype==INT )
|
|
|
|
|
*((int *)poin)= (int)value;
|
|
|
|
|
else if( but->pointype==FLO )
|
|
|
|
|
*((float *)poin)= value;
|
|
|
|
|
|
|
|
|
|
/* update select flag */
|
|
|
|
|
ui_is_but_sel(but);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-23 18:25:08 +00:00
|
|
|
void uiSetCurFont(uiBlock *block, int index)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
ui_set_ftf_font(block);
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if(block->aspect<0.60) {
|
2003-10-23 18:25:08 +00:00
|
|
|
block->curfont= UIfont[index].xl;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else if(block->aspect<1.15) {
|
|
|
|
|
block->curfont= UIfont[index].large;
|
|
|
|
|
}
|
|
|
|
|
else if(block->aspect<1.59) {
|
|
|
|
|
block->curfont= UIfont[index].medium;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
block->curfont= UIfont[index].small;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(block->curfont==NULL) block->curfont= UIfont[index].large;
|
|
|
|
|
if(block->curfont==NULL) block->curfont= UIfont[index].medium;
|
|
|
|
|
if(block->curfont==NULL) printf("error block no font %s\n", block->name);
|
2003-10-23 18:25:08 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiDefFont(unsigned int index, void *xl, void *large, void *medium, void *small)
|
|
|
|
|
{
|
|
|
|
|
if(index>=UI_ARRAY) return;
|
|
|
|
|
|
|
|
|
|
UIfont[index].xl= xl;
|
|
|
|
|
UIfont[index].large= large;
|
|
|
|
|
UIfont[index].medium= medium;
|
|
|
|
|
UIfont[index].small= small;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_free_link(uiLink *link)
|
|
|
|
|
{
|
|
|
|
|
if(link) {
|
|
|
|
|
BLI_freelistN(&link->lines);
|
|
|
|
|
MEM_freeN(link);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ui_free_but(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
if(but->str && but->str != but->strdata) MEM_freeN(but->str);
|
|
|
|
|
ui_free_link(but->link);
|
|
|
|
|
|
|
|
|
|
MEM_freeN(but);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiFreeBlock(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
|
2003-07-09 16:02:39 +00:00
|
|
|
if(block->flag & UI_BLOCK_BUSY) printf("attempt to free busy buttonblock: %p\n", block);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
while( (but= block->buttons.first) ) {
|
|
|
|
|
BLI_remlink(&block->buttons, but);
|
|
|
|
|
ui_free_but(but);
|
|
|
|
|
}
|
|
|
|
|
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
if(block->panel) block->panel->active= 0;
|
|
|
|
|
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
MEM_freeN(block);
|
|
|
|
|
UIbuttip= NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiFreeBlocks(ListBase *lb)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
|
|
|
|
|
while( (block= lb->first) ) {
|
|
|
|
|
BLI_remlink(lb, block);
|
|
|
|
|
uiFreeBlock(block);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiFreeBlocksWin(ListBase *lb, int win)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block, *blockn;
|
|
|
|
|
|
|
|
|
|
block= lb->first;
|
|
|
|
|
while(block) {
|
|
|
|
|
blockn= block->next;
|
|
|
|
|
if(block->win==win) {
|
|
|
|
|
BLI_remlink(lb, block);
|
|
|
|
|
uiFreeBlock(block);
|
|
|
|
|
}
|
|
|
|
|
block= blockn;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiBlock *uiNewBlock(ListBase *lb, char *name, short dt, short font, short win)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
|
|
|
|
|
/* each listbase only has one block with this name */
|
|
|
|
|
if(lb) {
|
|
|
|
|
for (block= lb->first; block; block= block->next)
|
|
|
|
|
if (BLI_streq(block->name, name))
|
|
|
|
|
break;
|
|
|
|
|
if (block) {
|
|
|
|
|
BLI_remlink(lb, block);
|
|
|
|
|
uiFreeBlock(block);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-07 15:50:44 +00:00
|
|
|
block= MEM_callocN(sizeof(uiBlock), "uiBlock");
|
2003-10-04 20:35:50 +00:00
|
|
|
if(lb) BLI_addhead(lb, block); /* at the beginning of the list! for dynamical menus/blocks */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
strcpy(block->name, name);
|
|
|
|
|
/* draw win */
|
|
|
|
|
block->win= win;
|
|
|
|
|
/* window where queue event should be added, pretty weak this way!
|
|
|
|
|
this is because the 'mainwin' pup menu's */
|
|
|
|
|
block->winq= mywinget();
|
|
|
|
|
block->dt= dt;
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
block->themecol= TH_AUTO;
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* aspect */
|
|
|
|
|
bwin_getsinglematrix(win, block->winmat);
|
|
|
|
|
|
|
|
|
|
if (win==G.curscreen->mainwin) {
|
|
|
|
|
block->aspect= 1.0;
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
block->auto_open= 2;
|
2002-10-12 11:37:38 +00:00
|
|
|
} else {
|
|
|
|
|
int getsizex, getsizey;
|
|
|
|
|
|
|
|
|
|
bwin_getsize(win, &getsizex, &getsizey);
|
|
|
|
|
block->aspect= 2.0/( (getsizex)*block->winmat[0][0]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiSetCurFont(block, font);
|
|
|
|
|
|
|
|
|
|
return block;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiBlock *uiGetBlock(char *name, ScrArea *sa)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block= sa->uiblocks.first;
|
|
|
|
|
|
|
|
|
|
while(block) {
|
|
|
|
|
if( strcmp(name, block->name)==0 ) return block;
|
|
|
|
|
block= block->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-30 19:18:08 +00:00
|
|
|
/* used for making screenshots for menus, called in screendump.c */
|
|
|
|
|
int uiIsMenu(int *x, int *y, int *sizex, int *sizey)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block= curarea->uiblocks.first;
|
|
|
|
|
int minx, miny, maxx, maxy;
|
|
|
|
|
|
|
|
|
|
minx= 1<<30;
|
|
|
|
|
miny= 1<<30;
|
|
|
|
|
maxx= 0;
|
|
|
|
|
maxy= 0;
|
|
|
|
|
|
|
|
|
|
while(block) {
|
|
|
|
|
if(block->flag & UI_BLOCK_LOOP) {
|
|
|
|
|
if(block->minx < minx) minx= (int)block->minx;
|
|
|
|
|
if(block->miny < miny) miny= (int)block->miny;
|
|
|
|
|
if(block->maxx > maxx) maxx= (int)block->maxx;
|
|
|
|
|
if(block->maxy > maxy) maxy= (int)block->maxy;
|
|
|
|
|
}
|
|
|
|
|
block= block->next;
|
|
|
|
|
}
|
|
|
|
|
printf("%d %d %d %d\n", minx, miny, maxx, maxy);
|
|
|
|
|
if(maxx!=0 && maxy!=0) {
|
|
|
|
|
*x= minx-10<0?0:minx;
|
|
|
|
|
*y= miny-10<0?0:miny;
|
|
|
|
|
*sizex= maxx-minx+10;
|
|
|
|
|
*sizey= maxy-miny+10;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-10-14 21:01:01 +00:00
|
|
|
|
2003-10-15 19:23:54 +00:00
|
|
|
void ui_check_but(uiBut *but)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
/* if something changed in the button */
|
|
|
|
|
ID *id;
|
|
|
|
|
double value;
|
2003-10-11 10:57:38 +00:00
|
|
|
float okwidth;
|
2002-10-12 11:37:38 +00:00
|
|
|
short pos;
|
|
|
|
|
|
|
|
|
|
ui_is_but_sel(but);
|
2003-10-11 10:57:38 +00:00
|
|
|
|
2003-10-11 11:28:24 +00:00
|
|
|
|
|
|
|
|
if(but->type==NUMSLI || but->type==HSVSLI)
|
|
|
|
|
okwidth= -7 + (but->x2 - but->x1)/2.0;
|
|
|
|
|
else
|
|
|
|
|
okwidth= -7 + (but->x2 - but->x1);
|
2003-10-11 10:57:38 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* name: */
|
|
|
|
|
switch( but->type ) {
|
|
|
|
|
|
|
|
|
|
case MENU:
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
case ICONTEXTROW:
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
if(but->x2 - but->x1 > 24) {
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
ui_set_name_menu(but, (int)value);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case NUM:
|
|
|
|
|
case NUMSLI:
|
|
|
|
|
case HSVSLI:
|
|
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
|
|
|
|
|
if( but->pointype==FLO ) {
|
2003-06-21 20:24:42 +00:00
|
|
|
if(but->a2) { /* amount of digits defined */
|
|
|
|
|
if(but->a2==1) sprintf(but->drawstr, "%s%.1f", but->str, value);
|
|
|
|
|
else if(but->a2==2) sprintf(but->drawstr, "%s%.2f", but->str, value);
|
|
|
|
|
else if(but->a2==3) sprintf(but->drawstr, "%s%.3f", but->str, value);
|
|
|
|
|
else sprintf(but->drawstr, "%s%.4f", but->str, value);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(but->max<10.001) sprintf(but->drawstr, "%s%.3f", but->str, value);
|
|
|
|
|
else sprintf(but->drawstr, "%s%.2f", but->str, value);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
sprintf(but->drawstr, "%s%d", but->str, (int)value);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case IDPOIN:
|
|
|
|
|
id= *(but->idpoin_idpp);
|
|
|
|
|
strcpy(but->drawstr, but->str);
|
|
|
|
|
if(id) strcat(but->drawstr, id->name+2);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TEX:
|
|
|
|
|
strcpy(but->drawstr, but->str);
|
|
|
|
|
strcat(but->drawstr, but->poin);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case KEYEVT:
|
|
|
|
|
strcpy(but->drawstr, but->str);
|
|
|
|
|
if (but->flag & UI_SELECT) {
|
|
|
|
|
strcat(but->drawstr, "Press a key");
|
|
|
|
|
} else {
|
|
|
|
|
strcat(but->drawstr, key_event_to_string((short) ui_get_but_val(but)));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
strcpy(but->drawstr, but->str);
|
|
|
|
|
|
|
|
|
|
}
|
2003-07-14 13:48:44 +00:00
|
|
|
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
if(but->drawstr[0]) {
|
2004-01-13 14:50:45 +00:00
|
|
|
but->strwidth= but->aspect*BIF_GetStringWidth(but->font, but->drawstr, (U.transopts & USER_TR_BUTTONS));
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
// here should be check for less space for icon offsets...
|
2003-10-11 18:15:07 +00:00
|
|
|
if(but->type==MENU) okwidth -= 20;
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
}
|
2003-07-14 13:48:44 +00:00
|
|
|
else
|
|
|
|
|
but->strwidth= 0;
|
|
|
|
|
|
|
|
|
|
/* automatic width */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(but->x2==0.0) {
|
|
|
|
|
but->x2= (but->x1+but->strwidth+6);
|
|
|
|
|
}
|
|
|
|
|
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
if(but->strwidth==0) but->drawstr[0]= 0;
|
2003-10-11 18:15:07 +00:00
|
|
|
else if(but->type==BUTM); // clip string
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
else {
|
|
|
|
|
|
|
|
|
|
/* calc but->ofs, to draw the string shorter if too long */
|
|
|
|
|
but->ofs= 0;
|
2003-10-11 10:57:38 +00:00
|
|
|
while(but->strwidth > (int)okwidth ) {
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
but->ofs++;
|
|
|
|
|
|
|
|
|
|
if(but->drawstr[but->ofs])
|
2004-01-13 14:50:45 +00:00
|
|
|
but->strwidth= but->aspect*BIF_GetStringWidth(but->font, but->drawstr+but->ofs, (U.transopts & USER_TR_BUTTONS));
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
else but->strwidth= 0;
|
|
|
|
|
|
|
|
|
|
/* textbut exception */
|
|
|
|
|
if(but->pos != -1) {
|
|
|
|
|
pos= but->pos+strlen(but->str);
|
|
|
|
|
if(pos-1 < but->ofs) {
|
|
|
|
|
pos= but->ofs-pos+1;
|
|
|
|
|
but->ofs -= pos;
|
|
|
|
|
if(but->ofs<0) {
|
|
|
|
|
but->ofs= 0;
|
|
|
|
|
pos--;
|
|
|
|
|
}
|
|
|
|
|
but->drawstr[ strlen(but->drawstr)-pos ]= 0;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
|
|
|
|
|
if(but->strwidth < 10) break;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
/* fix for buttons that better not have text cut off to the right */
|
|
|
|
|
if(but->ofs) {
|
2003-10-11 10:57:38 +00:00
|
|
|
if ELEM(but->type, NUM, TEX); // only these cut off left
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
else {
|
|
|
|
|
but->drawstr[ strlen(but->drawstr)-but->ofs ]= 0;
|
|
|
|
|
but->ofs= 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
Another huge commit!!!
First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.
- editbuts, animbuts, gamebuts, displaybuts, paintbuts, work now
- i quite completely reorganized it, it's now nicely telling you what
context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
(except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore
And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.
Next step: restoring material/lamp/texture/world
2003-10-10 17:29:01 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* test for min and max, icon sliders, etc */
|
|
|
|
|
|
|
|
|
|
switch( but->type ) {
|
|
|
|
|
case NUM:
|
|
|
|
|
case SLI:
|
|
|
|
|
case SCROLL:
|
|
|
|
|
case NUMSLI:
|
|
|
|
|
case HSVSLI:
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
if(value < but->min) value= but->min;
|
|
|
|
|
if(value > but->max) value= but->max;
|
|
|
|
|
ui_set_but_val(but, value);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ICONTOG:
|
|
|
|
|
if(but->flag & UI_SELECT) but->iconadd= 1;
|
|
|
|
|
else but->iconadd= 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ICONROW:
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
but->iconadd= (int)value- (int)(but->min);
|
|
|
|
|
break;
|
2003-05-10 10:36:14 +00:00
|
|
|
|
|
|
|
|
case ICONTEXTROW:
|
|
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
but->iconadd= (int)value- (int)(but->min);
|
|
|
|
|
break;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
static int ui_auto_themecol(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
switch(but->type) {
|
|
|
|
|
case BUT:
|
|
|
|
|
return TH_BUT_ACTION;
|
|
|
|
|
case ROW:
|
|
|
|
|
case TOG:
|
|
|
|
|
case TOG3:
|
|
|
|
|
case TOGR:
|
|
|
|
|
case TOGN:
|
|
|
|
|
return TH_BUT_SETTING;
|
|
|
|
|
case SLI:
|
|
|
|
|
case NUM:
|
|
|
|
|
case NUMSLI:
|
|
|
|
|
case HSVSLI:
|
|
|
|
|
return TH_BUT_NUM;
|
|
|
|
|
case TEX:
|
|
|
|
|
return TH_BUT_TEXTFIELD;
|
|
|
|
|
case BLOCK:
|
|
|
|
|
case MENU:
|
|
|
|
|
case BUTM:
|
|
|
|
|
// (weak!) detect if it is a blockloop
|
|
|
|
|
if(UIbuttip) return TH_MENU_ITEM;
|
|
|
|
|
return TH_BUT_POPUP;
|
|
|
|
|
default:
|
|
|
|
|
return TH_BUT_NEUTRAL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-14 15:49:26 +00:00
|
|
|
void uiBlockBeginAlign(uiBlock *block)
|
2003-11-14 00:44:48 +00:00
|
|
|
{
|
|
|
|
|
/* if other align was active, end it */
|
|
|
|
|
if(block->flag & UI_BUT_ALIGN) uiBlockEndAlign(block);
|
|
|
|
|
|
2003-11-14 15:49:26 +00:00
|
|
|
block->flag |= UI_BUT_ALIGN_DOWN;
|
|
|
|
|
/* buttons declared after this call will this align flag */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int buts_are_horiz(uiBut *but1, uiBut *but2)
|
|
|
|
|
{
|
|
|
|
|
float dx, dy;
|
|
|
|
|
|
|
|
|
|
dx= fabs( but1->x2 - but2->x1);
|
|
|
|
|
dy= fabs( but1->y1 - but2->y2);
|
2003-11-14 00:44:48 +00:00
|
|
|
|
2003-11-14 15:49:26 +00:00
|
|
|
if(dx > dy) return 0;
|
|
|
|
|
return 1;
|
2003-11-14 00:44:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiBlockEndAlign(uiBlock *block)
|
2003-11-14 15:49:26 +00:00
|
|
|
{
|
|
|
|
|
uiBut *prev, *but=NULL, *next;
|
|
|
|
|
int flag= 0, cols=0, rows=0;
|
|
|
|
|
|
2003-12-07 06:05:08 +00:00
|
|
|
if ( !((BIF_GetThemeValue(TH_BUT_DRAWTYPE) == 1) || (BIF_GetThemeValue(TH_BUT_DRAWTYPE) == 2))) return;
|
2003-11-14 15:49:26 +00:00
|
|
|
|
|
|
|
|
/* auto align:
|
|
|
|
|
- go back to first button of align start (ALIGN_DOWN)
|
|
|
|
|
- compare triples, and define flags
|
|
|
|
|
*/
|
|
|
|
|
prev= block->buttons.last;
|
|
|
|
|
while(prev) {
|
|
|
|
|
if( (prev->flag & UI_BUT_ALIGN_DOWN)) but= prev;
|
|
|
|
|
else break;
|
|
|
|
|
|
|
|
|
|
if(but && but->next) {
|
|
|
|
|
if(buts_are_horiz(but, but->next)) cols++;
|
|
|
|
|
else rows++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prev= prev->prev;
|
|
|
|
|
}
|
|
|
|
|
if(but==NULL) return;
|
|
|
|
|
|
|
|
|
|
/* rows==0: 1 row, cols==0: 1 collumn */
|
|
|
|
|
|
|
|
|
|
prev= NULL;
|
|
|
|
|
while(but) {
|
|
|
|
|
next= but->next;
|
|
|
|
|
|
|
|
|
|
/* clear old flag */
|
|
|
|
|
but->flag &= ~UI_BUT_ALIGN_DOWN;
|
|
|
|
|
|
|
|
|
|
if(flag==0) { /* first case */
|
|
|
|
|
if(next) {
|
|
|
|
|
if(buts_are_horiz(but, next)) {
|
|
|
|
|
if(rows==0)
|
|
|
|
|
flag= UI_BUT_ALIGN_RIGHT;
|
|
|
|
|
else
|
|
|
|
|
flag= UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_RIGHT;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
flag= UI_BUT_ALIGN_DOWN;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(next==NULL) { /* last case */
|
|
|
|
|
if(prev) {
|
|
|
|
|
if(buts_are_horiz(prev, but)) {
|
|
|
|
|
if(rows==0)
|
|
|
|
|
flag= UI_BUT_ALIGN_LEFT;
|
|
|
|
|
else
|
|
|
|
|
flag= UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_LEFT;
|
|
|
|
|
}
|
|
|
|
|
else flag= UI_BUT_ALIGN_TOP;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(buts_are_horiz(but, next)) {
|
|
|
|
|
/* check if this is already second row */
|
|
|
|
|
if( prev && buts_are_horiz(prev, but)==0) {
|
|
|
|
|
flag |= UI_BUT_ALIGN_TOP;
|
|
|
|
|
/* exception case: bottom row */
|
|
|
|
|
if(rows>0) {
|
|
|
|
|
uiBut *bt= but;
|
|
|
|
|
while(bt) {
|
|
|
|
|
if(bt->next && buts_are_horiz(bt, bt->next)==0 ) break;
|
|
|
|
|
bt= bt->next;
|
|
|
|
|
}
|
|
|
|
|
if(bt==0) flag= UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_RIGHT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else flag |= UI_BUT_ALIGN_LEFT;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(cols==0) {
|
|
|
|
|
flag |= UI_BUT_ALIGN_TOP;
|
|
|
|
|
}
|
|
|
|
|
else { /* next button switches to new row */
|
|
|
|
|
if( (flag & UI_BUT_ALIGN_TOP)==0) { /* stil top row */
|
|
|
|
|
flag= UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT;
|
|
|
|
|
}
|
|
|
|
|
else flag |= UI_BUT_ALIGN_TOP;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
but->flag |= flag;
|
|
|
|
|
|
|
|
|
|
/* merge coordinates */
|
|
|
|
|
if(prev) {
|
|
|
|
|
// simple cases
|
|
|
|
|
if(rows==0) {
|
|
|
|
|
but->x1= (prev->x2+but->x1)/2.0;
|
|
|
|
|
prev->x2= but->x1;
|
|
|
|
|
}
|
|
|
|
|
else if(cols==0) {
|
|
|
|
|
but->y2= (prev->y1+but->y2)/2.0;
|
|
|
|
|
prev->y1= but->y2;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(buts_are_horiz(prev, but)) {
|
|
|
|
|
but->x1= (prev->x2+but->x1)/2.0;
|
|
|
|
|
prev->x2= but->x1;
|
|
|
|
|
/* copy height too */
|
|
|
|
|
but->y2= prev->y2;
|
|
|
|
|
}
|
|
|
|
|
else if(prev->prev && buts_are_horiz(prev->prev, prev)==0) {
|
|
|
|
|
/* the previous button is a single one in its row */
|
|
|
|
|
but->y2= (prev->y1+but->y2)/2.0;
|
|
|
|
|
prev->y1= but->y2;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* the previous button is not a single one in its row */
|
|
|
|
|
but->y2= prev->y1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prev= but;
|
|
|
|
|
but= next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
block->flag &= ~UI_BUT_ALIGN; // all 4 flags
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiBlockEndAligno(uiBlock *block)
|
2003-11-14 00:44:48 +00:00
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
|
|
|
|
|
/* correct last defined button */
|
|
|
|
|
but= block->buttons.last;
|
|
|
|
|
if(but) {
|
2003-11-14 15:49:26 +00:00
|
|
|
/* vertical align case */
|
|
|
|
|
if( (block->flag & UI_BUT_ALIGN) == (UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_DOWN) ) {
|
2003-11-14 00:44:48 +00:00
|
|
|
but->flag &= ~UI_BUT_ALIGN_DOWN;
|
2003-11-14 15:49:26 +00:00
|
|
|
}
|
|
|
|
|
/* horizontal align case */
|
|
|
|
|
if( (block->flag & UI_BUT_ALIGN) == (UI_BUT_ALIGN_LEFT|UI_BUT_ALIGN_RIGHT) ) {
|
2003-11-14 00:44:48 +00:00
|
|
|
but->flag &= ~UI_BUT_ALIGN_RIGHT;
|
2003-11-14 15:49:26 +00:00
|
|
|
}
|
|
|
|
|
/* else do nothing, manually provided flags */
|
2003-11-14 00:44:48 +00:00
|
|
|
}
|
|
|
|
|
block->flag &= ~UI_BUT_ALIGN; // all 4 flags
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but;
|
|
|
|
|
short slen;
|
|
|
|
|
|
2003-04-30 13:22:26 +00:00
|
|
|
if(type & BUTPOIN) { /* a pointer is required */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(poin==0) {
|
2003-04-30 13:22:26 +00:00
|
|
|
/* if pointer is zero, button is removed and not drawn */
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
BIF_ThemeColor(block->themecol);
|
2002-10-12 11:37:38 +00:00
|
|
|
glRects(x1, y1, x1+x2, y1+y2);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
but= MEM_callocN(sizeof(uiBut), "uiBut");
|
|
|
|
|
|
|
|
|
|
but->type= type & BUTTYPE;
|
|
|
|
|
but->pointype= type & BUTPOIN;
|
|
|
|
|
but->bit= type & BIT;
|
|
|
|
|
but->bitnr= type & 31;
|
|
|
|
|
|
|
|
|
|
BLI_addtail(&block->buttons, but);
|
|
|
|
|
|
|
|
|
|
but->retval= retval;
|
|
|
|
|
if( strlen(str)>=UI_MAX_NAME_STR-1 ) {
|
|
|
|
|
but->str= MEM_callocN( strlen(str)+2, "uiDefBut");
|
|
|
|
|
strcpy(but->str, str);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
but->str= but->strdata;
|
|
|
|
|
strcpy(but->str, str);
|
|
|
|
|
}
|
|
|
|
|
but->x1= x1;
|
|
|
|
|
but->y1= y1;
|
|
|
|
|
if(block->autofill) {
|
|
|
|
|
but->x2= x2;
|
|
|
|
|
but->y2= y2;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
but->x2= (x1+x2);
|
|
|
|
|
but->y2= (y1+y2);
|
|
|
|
|
}
|
|
|
|
|
but->poin= poin;
|
|
|
|
|
but->min= min;
|
|
|
|
|
but->max= max;
|
|
|
|
|
but->a1= a1;
|
|
|
|
|
but->a2= a2;
|
|
|
|
|
but->tip= tip;
|
|
|
|
|
|
|
|
|
|
but->font= block->curfont;
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
but->lock= UIlock;
|
|
|
|
|
but->lockstr= UIlockstr;
|
|
|
|
|
|
|
|
|
|
but->aspect= block->aspect;
|
|
|
|
|
but->win= block->win;
|
2003-07-07 15:50:44 +00:00
|
|
|
but->block= block; // pointer back, used for frontbuffer status
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
if(block->themecol==TH_AUTO) but->themecol= ui_auto_themecol(but);
|
|
|
|
|
else but->themecol= block->themecol;
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if (but->type==BUTM) {
|
|
|
|
|
but->butm_func= block->butm_func;
|
|
|
|
|
but->butm_func_arg= block->butm_func_arg;
|
|
|
|
|
} else {
|
|
|
|
|
but->func= block->func;
|
|
|
|
|
but->func_arg1= block->func_arg1;
|
|
|
|
|
but->func_arg2= block->func_arg2;
|
|
|
|
|
}
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
ui_set_embossfunc(but, block->dt);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
but->pos= -1; /* cursor invisible */
|
|
|
|
|
|
2003-04-30 13:22:26 +00:00
|
|
|
if(but->type==NUM) { /* add a space to name */
|
2002-10-12 11:37:38 +00:00
|
|
|
slen= strlen(but->str);
|
|
|
|
|
if(slen>0 && slen<UI_MAX_NAME_STR-2) {
|
|
|
|
|
if(but->str[slen-1]!=' ') {
|
|
|
|
|
but->str[slen]= ' ';
|
|
|
|
|
but->str[slen+1]= 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
if ELEM8(but->type, HSVSLI , NUMSLI, MENU, TEX, LABEL, IDPOIN, BLOCK, BUTM) {
|
2002-10-12 11:37:38 +00:00
|
|
|
but->flag |= UI_TEXT_LEFT;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-14 15:49:26 +00:00
|
|
|
but->flag |= (block->flag & UI_BUT_ALIGN);
|
2003-11-14 00:44:48 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
return but;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiBut *uiDefBut(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but= ui_def_but(block, type, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip);
|
|
|
|
|
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
|
|
|
|
|
return but;
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
|
|
|
|
|
/* if _x_ is a power of two (only one bit) return the power,
|
|
|
|
|
* otherwise return -1.
|
|
|
|
|
* (1<<findBitIndex(x))==x for powers of two.
|
|
|
|
|
*/
|
|
|
|
|
static int findBitIndex(unsigned int x) {
|
|
|
|
|
if (!x || (x&(x-1))!=0) { /* x&(x-1) strips lowest bit */
|
|
|
|
|
return -1;
|
|
|
|
|
} else {
|
|
|
|
|
int idx= 0;
|
|
|
|
|
|
|
|
|
|
if (x&0xFFFF0000) idx+=16, x>>=16;
|
|
|
|
|
if (x&0xFF00) idx+=8, x>>=8;
|
|
|
|
|
if (x&0xF0) idx+=4, x>>=4;
|
|
|
|
|
if (x&0xC) idx+=2, x>>=2;
|
|
|
|
|
if (x&0x2) idx+=1;
|
|
|
|
|
|
|
|
|
|
return idx;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
static uiBut *uiDefButBit(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
int bitIdx= findBitIndex(bit);
|
|
|
|
|
if (bitIdx==-1) {
|
|
|
|
|
return NULL;
|
|
|
|
|
} else {
|
|
|
|
|
return uiDefBut(block, type|BIT|bitIdx, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *uiDefButF(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefBut(block, type|FLO, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefButBitF(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefButBit(block, type|FLO, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *uiDefButI(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefBut(block, type|INT, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefButBitI(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefButBit(block, type|INT, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *uiDefButS(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefBut(block, type|SHO, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefButBitS(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefButBit(block, type|SHO, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *uiDefButC(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefBut(block, type|CHA, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefButBitC(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefButBit(block, type|CHA, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
uiBut *uiDefIconBut(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but= ui_def_but(block, type, retval, "", x1, y1, x2, y2, poin, min, max, a1, a2, tip);
|
|
|
|
|
|
|
|
|
|
but->icon= (BIFIconID) icon;
|
|
|
|
|
but->flag|= UI_HAS_ICON;
|
|
|
|
|
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
|
|
|
|
|
return but;
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
static uiBut *uiDefIconButBit(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
int bitIdx= findBitIndex(bit);
|
|
|
|
|
if (bitIdx==-1) {
|
|
|
|
|
return NULL;
|
|
|
|
|
} else {
|
|
|
|
|
return uiDefIconBut(block, type|BIT|bitIdx, retval, icon, x1, y1, x2, y2, poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
uiBut *uiDefIconButF(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconBut(block, type|FLO, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconButBitF(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconButBit(block, type|FLO, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *uiDefIconButI(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconBut(block, type|INT, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconButBitI(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconButBit(block, type|INT, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *uiDefIconButS(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconBut(block, type|SHO, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconButBitS(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconButBit(block, type|SHO, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
uiBut *uiDefIconButC(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconBut(block, type|CHA, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconButBitC(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconButBit(block, type|CHA, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-05-10 10:36:14 +00:00
|
|
|
/* Button containing both string label and icon */
|
|
|
|
|
uiBut *uiDefIconTextBut(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but= ui_def_but(block, type, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip);
|
|
|
|
|
|
|
|
|
|
but->icon= (BIFIconID) icon;
|
|
|
|
|
but->flag|= UI_HAS_ICON;
|
|
|
|
|
|
|
|
|
|
but->flag|= UI_ICON_LEFT;
|
|
|
|
|
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
|
|
|
|
|
return but;
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
static uiBut *uiDefIconTextButBit(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
int bitIdx= findBitIndex(bit);
|
|
|
|
|
if (bitIdx==-1) {
|
|
|
|
|
return NULL;
|
|
|
|
|
} else {
|
|
|
|
|
return uiDefIconTextBut(block, type|BIT|bitIdx, retval, icon, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-05-10 10:36:14 +00:00
|
|
|
|
|
|
|
|
uiBut *uiDefIconTextButF(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextBut(block, type|FLO, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconTextButBitF(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextButBit(block, type|FLO, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2003-05-10 10:36:14 +00:00
|
|
|
uiBut *uiDefIconTextButI(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextBut(block, type|INT, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconTextButBitI(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextButBit(block, type|INT, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2003-05-10 10:36:14 +00:00
|
|
|
uiBut *uiDefIconTextButS(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextBut(block, type|SHO, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconTextButBitS(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextButBit(block, type|SHO, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
2003-05-10 10:36:14 +00:00
|
|
|
uiBut *uiDefIconTextButC(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextBut(block, type|CHA, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
- committed new uiDef{Icon,IconText,}ButBit? functions
- change object draw flag buttons to use new functions (just an example)
While I probably wouldn't recommend patching other buttons to use the new
functions a week before release, it is a good (simple but tedious) project
to complete. Note that some code actually defined the constants for the
bit index, when such code is fixed the _BIT constant should be removed from
the headers.
Example:
DNA_constraint_types.h:
#define CONSTRAINT_DISABLE 0x00000004
#define CONSTRAINT_DISABLE_BIT 2
buttons_object.c:
uiDefIconButS(block, ICONTOG|BIT|CONSTRAINT_EXPAND_BIT, ...);
The button definition should change to:
uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, ...);
(whats that, the more correct way uses less typing, GOOD GOD!)
and the CONSTRAINT_DISABLE_BIT define should be removed.
2004-01-08 19:53:19 +00:00
|
|
|
uiBut *uiDefIconTextButBitC(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip)
|
|
|
|
|
{
|
|
|
|
|
return uiDefIconTextButBit(block, type|CHA, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip);
|
|
|
|
|
}
|
|
|
|
|
|
2003-05-10 10:36:14 +00:00
|
|
|
/* END Button containing both string label and icon */
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
void uiAutoBlock(uiBlock *block, float minx, float miny, float sizex, float sizey, int flag)
|
|
|
|
|
{
|
|
|
|
|
block->minx= minx;
|
|
|
|
|
block->maxx= minx+sizex;
|
|
|
|
|
block->miny= miny;
|
|
|
|
|
block->maxy= miny+sizey;
|
|
|
|
|
|
|
|
|
|
block->autofill= flag; /* also check for if it has to be done */
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiSetButLink(uiBut *but, void **poin, void ***ppoin, short *tot, int from, int to)
|
|
|
|
|
{
|
|
|
|
|
uiLink *link;
|
|
|
|
|
|
|
|
|
|
link= but->link= MEM_callocN(sizeof(uiLink), "new uilink");
|
|
|
|
|
|
|
|
|
|
link->poin= poin;
|
|
|
|
|
link->ppoin= ppoin;
|
|
|
|
|
link->totlink= tot;
|
|
|
|
|
link->fromcode= from;
|
|
|
|
|
link->tocode= to;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* cruft to make uiBlock and uiBut private */
|
|
|
|
|
|
|
|
|
|
int uiBlocksGetYMin(ListBase *lb)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
int min= 0;
|
|
|
|
|
|
|
|
|
|
for (block= lb->first; block; block= block->next)
|
|
|
|
|
if (block==lb->first || block->miny<min)
|
|
|
|
|
min= block->miny;
|
|
|
|
|
|
|
|
|
|
return min;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int uiBlockGetCol(uiBlock *block)
|
|
|
|
|
{
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
return block->themecol;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
void uiBlockSetCol(uiBlock *block, int col)
|
|
|
|
|
{
|
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
|
|
|
block->themecol= col;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
void uiBlockSetEmboss(uiBlock *block, int emboss)
|
|
|
|
|
{
|
|
|
|
|
block->dt= emboss;
|
|
|
|
|
}
|
|
|
|
|
void uiBlockSetDirection(uiBlock *block, int direction)
|
|
|
|
|
{
|
|
|
|
|
block->direction= direction;
|
|
|
|
|
}
|
2003-10-07 12:49:39 +00:00
|
|
|
void uiBlockFlipOrder(uiBlock *block)
|
|
|
|
|
{
|
2004-01-23 20:54:26 +00:00
|
|
|
ListBase lb;
|
|
|
|
|
uiBut *but, *next;
|
2003-10-07 12:49:39 +00:00
|
|
|
float centy, miny=10000, maxy= -10000;
|
|
|
|
|
|
|
|
|
|
for(but= block->buttons.first; but; but= but->next) {
|
|
|
|
|
if(but->y1 < miny) miny= but->y1;
|
|
|
|
|
if(but->y2 > maxy) maxy= but->y2;
|
|
|
|
|
}
|
|
|
|
|
/* mirror trick */
|
|
|
|
|
centy= (miny+maxy)/2.0;
|
|
|
|
|
for(but= block->buttons.first; but; but= but->next) {
|
|
|
|
|
but->y1 = centy-(but->y1-centy);
|
|
|
|
|
but->y2 = centy-(but->y2-centy);
|
|
|
|
|
SWAP(float, but->y1, but->y2);
|
|
|
|
|
}
|
2004-01-23 20:54:26 +00:00
|
|
|
|
|
|
|
|
/* also flip order in block itself, for example for arrowkey */
|
|
|
|
|
lb.first= lb.last= NULL;
|
|
|
|
|
but= block->buttons.first;
|
|
|
|
|
while(but) {
|
|
|
|
|
next= but->next;
|
|
|
|
|
BLI_remlink(&block->buttons, but);
|
|
|
|
|
BLI_addtail(&lb, but);
|
|
|
|
|
but= next;
|
|
|
|
|
}
|
|
|
|
|
block->buttons= lb;
|
2003-10-07 12:49:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
void uiBlockSetFlag(uiBlock *block, int flag)
|
|
|
|
|
{
|
|
|
|
|
block->flag= flag;
|
|
|
|
|
}
|
|
|
|
|
void uiBlockSetXOfs(uiBlock *block, int xofs)
|
|
|
|
|
{
|
|
|
|
|
block->xofs= xofs;
|
|
|
|
|
}
|
|
|
|
|
void* uiBlockGetCurFont(uiBlock *block)
|
|
|
|
|
{
|
|
|
|
|
return block->curfont;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiButSetFlag(uiBut *but, int flag)
|
|
|
|
|
{
|
|
|
|
|
but->flag|= flag;
|
|
|
|
|
}
|
2003-10-07 12:49:39 +00:00
|
|
|
void uiButClearFlag(uiBut *but, int flag)
|
|
|
|
|
{
|
|
|
|
|
but->flag&= ~flag;
|
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
int uiButGetRetVal(uiBut *but)
|
|
|
|
|
{
|
|
|
|
|
return but->retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void uiBlockSetButmFunc(uiBlock *block, void (*menufunc)(void *arg, int event), void *arg)
|
|
|
|
|
{
|
|
|
|
|
block->butm_func= menufunc;
|
|
|
|
|
block->butm_func_arg= arg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiBlockSetFunc(uiBlock *block, void (*func)(void *arg1, void *arg2), void *arg1, void *arg2)
|
|
|
|
|
{
|
|
|
|
|
block->func= func;
|
|
|
|
|
block->func_arg1= arg1;
|
|
|
|
|
block->func_arg2= arg2;
|
|
|
|
|
}
|
2003-10-11 00:21:05 +00:00
|
|
|
|
|
|
|
|
void uiBlockSetDrawExtraFunc(uiBlock *block, void (*func)())
|
|
|
|
|
{
|
|
|
|
|
block->drawextra= func;
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
void uiButSetFunc(uiBut *but, void (*func)(void *arg1, void *arg2), void *arg1, void *arg2)
|
|
|
|
|
{
|
|
|
|
|
but->func= func;
|
|
|
|
|
but->func_arg1= arg1;
|
|
|
|
|
but->func_arg2= arg2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, int retval, char *str, short x1, short y1, short x2, short y2, void *idpp, char *tip)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but= ui_def_but(block, IDPOIN, retval, str, x1, y1, x2, y2, NULL, 0.0, 0.0, 0.0, 0.0, tip);
|
|
|
|
|
but->idpoin_func= func;
|
|
|
|
|
but->idpoin_idpp= (ID**) idpp;
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-07 12:49:39 +00:00
|
|
|
uiBut *uiDefBlockBut(uiBlock *block, uiBlockFuncFP func, void *arg, char *str, short x1, short y1, short x2, short y2, char *tip)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
|
uiBut *but= ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip);
|
|
|
|
|
but->block_func= func;
|
|
|
|
|
ui_check_but(but);
|
2003-10-07 12:49:39 +00:00
|
|
|
return but;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
2003-10-04 20:35:50 +00:00
|
|
|
/* Block button containing both string label and icon */
|
2003-10-07 12:49:39 +00:00
|
|
|
uiBut *uiDefIconTextBlockBut(uiBlock *block, uiBlockFuncFP func, void *arg, int icon, char *str, short x1, short y1, short x2, short y2, char *tip)
|
2003-10-04 20:35:50 +00:00
|
|
|
{
|
|
|
|
|
uiBut *but= ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip);
|
|
|
|
|
|
|
|
|
|
but->icon= (BIFIconID) icon;
|
|
|
|
|
but->flag|= UI_HAS_ICON;
|
|
|
|
|
|
|
|
|
|
but->flag|= UI_ICON_LEFT;
|
|
|
|
|
but->flag|= UI_ICON_RIGHT;
|
|
|
|
|
|
|
|
|
|
but->block_func= func;
|
|
|
|
|
ui_check_but(but);
|
2003-10-07 12:49:39 +00:00
|
|
|
|
|
|
|
|
return but;
|
2003-10-04 20:35:50 +00:00
|
|
|
}
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
void uiDefKeyevtButS(uiBlock *block, int retval, char *str, short x1, short y1, short x2, short y2, short *spoin, char *tip)
|
|
|
|
|
{
|
|
|
|
|
uiBut *but= ui_def_but(block, KEYEVT|SHO, retval, str, x1, y1, x2, y2, spoin, 0.0, 0.0, 0.0, 0.0, tip);
|
|
|
|
|
ui_check_but(but);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ******************** PUPmenu ****************** */
|
|
|
|
|
|
|
|
|
|
short pupmenu(char *instr)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
ListBase listb= {NULL, NULL};
|
|
|
|
|
int event;
|
|
|
|
|
static int lastselected= 0;
|
2003-10-17 19:03:53 +00:00
|
|
|
short width, height=0, mousexmove = 0, mouseymove, xmax, ymax, mval[2], val= -1;
|
2002-10-12 11:37:38 +00:00
|
|
|
short a, startx, starty, endx, endy, boxh=TBOXH, x1, y1;
|
|
|
|
|
static char laststring[UI_MAX_NAME_STR];
|
|
|
|
|
MenuData *md;
|
2003-10-23 22:28:49 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/* block stuff first, need to know the font */
|
|
|
|
|
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
|
|
|
|
|
uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
|
2003-10-20 18:15:06 +00:00
|
|
|
block->themecol= TH_MENU_ITEM;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
md= decompose_menu_string(instr);
|
|
|
|
|
|
|
|
|
|
/* size and location, title slightly bigger for bold */
|
2004-01-13 14:50:45 +00:00
|
|
|
if(md->title) width= 2*strlen(md->title)+BIF_GetStringWidth(uiBlockGetCurFont(block), md->title, (U.transopts && USER_TR_BUTTONS));
|
2002-10-12 11:37:38 +00:00
|
|
|
else width= 0;
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
2003-10-17 19:03:53 +00:00
|
|
|
char *name= md->items[a].str;
|
|
|
|
|
|
2004-01-13 14:50:45 +00:00
|
|
|
xmax= BIF_GetStringWidth(uiBlockGetCurFont(block), md->items[a].str, (U.transopts && USER_TR_BUTTONS));
|
2002-10-12 11:37:38 +00:00
|
|
|
if(xmax>width) width= xmax;
|
2003-10-17 19:03:53 +00:00
|
|
|
|
2003-10-21 07:28:44 +00:00
|
|
|
if( strcmp(name, "%l")==0) height+= 6;
|
2003-10-17 19:03:53 +00:00
|
|
|
else height+= boxh;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2003-05-03 12:17:11 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
width+= 10;
|
|
|
|
|
|
|
|
|
|
xmax = G.curscreen->sizex;
|
|
|
|
|
ymax = G.curscreen->sizey;
|
|
|
|
|
|
|
|
|
|
getmouseco_sc(mval);
|
|
|
|
|
|
|
|
|
|
if(strncmp(laststring, instr, UI_MAX_NAME_STR-1)!=0) lastselected= 0;
|
|
|
|
|
BLI_strncpy(laststring, instr, UI_MAX_NAME_STR);
|
|
|
|
|
|
|
|
|
|
startx= mval[0]-width/2;
|
|
|
|
|
if(lastselected>=0 && lastselected<md->nitems) {
|
|
|
|
|
starty= mval[1]-height+boxh/2+lastselected*boxh;
|
|
|
|
|
}
|
|
|
|
|
else starty= mval[1]-height/2;
|
|
|
|
|
|
|
|
|
|
mouseymove= 0;
|
|
|
|
|
|
|
|
|
|
if(startx<10) startx= 10;
|
|
|
|
|
if(starty<10) {
|
|
|
|
|
mouseymove= 10-starty;
|
|
|
|
|
starty= 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
endx= startx+width;
|
|
|
|
|
endy= starty+height;
|
|
|
|
|
if(endx>xmax) {
|
|
|
|
|
endx= xmax-10;
|
|
|
|
|
startx= endx-width;
|
|
|
|
|
}
|
|
|
|
|
if(endy>ymax-20) {
|
|
|
|
|
mouseymove= ymax-endy-20;
|
|
|
|
|
endy= ymax-20;
|
|
|
|
|
starty= endy-height;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(mouseymove) {
|
2003-07-10 20:34:41 +00:00
|
|
|
ui_warp_pointer(mval[0], mouseymove+mval[1]);
|
2002-10-12 11:37:38 +00:00
|
|
|
mousexmove= mval[0];
|
|
|
|
|
mouseymove= mval[1];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* here we go! */
|
|
|
|
|
if(md->title) {
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
uiSetCurFont(block, UI_HELVB);
|
|
|
|
|
bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+md->nitems*boxh), width, boxh, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
bt->flag= UI_TEXT_LEFT;
|
|
|
|
|
uiSetCurFont(block, UI_HELV);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
y1= starty + boxh*(md->nitems-1);
|
|
|
|
|
x1= startx;
|
2003-11-12 22:20:27 +00:00
|
|
|
|
2003-10-17 19:03:53 +00:00
|
|
|
for(a=0; a<md->nitems; a++) {
|
2002-10-12 11:37:38 +00:00
|
|
|
char *name= md->items[a].str;
|
|
|
|
|
|
|
|
|
|
if( strcmp(name, "%l")==0) {
|
2003-10-21 07:28:44 +00:00
|
|
|
uiDefBut(block, SEPR, B_NOP, "", x1, y1, width, 6, NULL, 0, 0.0, 0, 0, "");
|
|
|
|
|
y1 -= 6;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
uiDefButS(block, BUTM, B_NOP, name, x1, y1, width, boxh-1, &val, (float) md->items[a].retval, 0.0, 0, 0, "");
|
2003-10-17 19:03:53 +00:00
|
|
|
y1 -= boxh;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiBoundsBlock(block, 2);
|
|
|
|
|
|
|
|
|
|
event= uiDoBlocks(&listb, 0);
|
|
|
|
|
|
|
|
|
|
/* calculate last selected */
|
|
|
|
|
lastselected= 0;
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
|
|
|
|
if(val==md->items[a].retval) lastselected= a;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
menudata_free(md);
|
|
|
|
|
|
2003-07-10 20:34:41 +00:00
|
|
|
if(mouseymove && (event & UI_RETURN_OUT)==0) ui_warp_pointer(mousexmove, mouseymove);
|
2002-10-12 11:37:38 +00:00
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
short pupmenu_col(char *instr, int maxrow)
|
|
|
|
|
{
|
|
|
|
|
uiBlock *block;
|
|
|
|
|
ListBase listb= {NULL, NULL};
|
|
|
|
|
int columns, rows;
|
|
|
|
|
short mousemove[2], mval[2], event;
|
|
|
|
|
int width, height, xmax, ymax, val= -1;
|
|
|
|
|
int a, startx, starty, endx, endy, boxh=TBOXH, x1, y1;
|
|
|
|
|
MenuData *md;
|
|
|
|
|
|
|
|
|
|
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
|
|
|
|
|
uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT);
|
2003-10-20 18:15:06 +00:00
|
|
|
block->themecol= TH_MENU_ITEM;
|
2003-10-05 21:00:01 +00:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
md= decompose_menu_string(instr);
|
|
|
|
|
|
|
|
|
|
/* collumns and row calculation */
|
|
|
|
|
columns= (md->nitems+maxrow)/maxrow;
|
|
|
|
|
if (columns<1) columns= 1;
|
|
|
|
|
|
|
|
|
|
rows= (int) md->nitems/columns;
|
|
|
|
|
if (rows<1) rows= 1;
|
|
|
|
|
|
2003-11-05 23:54:22 +00:00
|
|
|
while (rows*columns<(md->nitems+columns) ) rows++;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
/* size and location */
|
2004-01-13 14:50:45 +00:00
|
|
|
if(md->title) width= 2*strlen(md->title)+BIF_GetStringWidth(uiBlockGetCurFont(block), md->title, (U.transopts & USER_TR_BUTTONS));
|
2002-10-12 11:37:38 +00:00
|
|
|
else width= 0;
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
2004-01-13 14:50:45 +00:00
|
|
|
xmax= BIF_GetStringWidth(uiBlockGetCurFont(block), md->items[a].str, (U.transopts & USER_TR_BUTTONS));
|
2002-10-12 11:37:38 +00:00
|
|
|
if(xmax>width) width= xmax;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
width+= 10;
|
|
|
|
|
if (width<50) width=50;
|
|
|
|
|
|
|
|
|
|
boxh= TBOXH;
|
|
|
|
|
|
|
|
|
|
height= rows*boxh;
|
|
|
|
|
if (md->title) height+= boxh;
|
|
|
|
|
|
|
|
|
|
xmax = G.curscreen->sizex;
|
|
|
|
|
ymax = G.curscreen->sizey;
|
|
|
|
|
|
|
|
|
|
getmouseco_sc(mval);
|
|
|
|
|
|
|
|
|
|
/* find active item */
|
|
|
|
|
#if 0
|
|
|
|
|
fvalue= ui_get_but_val(but);
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
|
|
|
|
if( md->items[a].retval== (int)fvalue ) break;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
/* no active item? */
|
|
|
|
|
if(a==md->nitems) {
|
|
|
|
|
if(md->title) a= -1;
|
|
|
|
|
else a= 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(a>0)
|
|
|
|
|
startx = mval[0]-width/2 - ((int)(a)/rows)*width;
|
|
|
|
|
else
|
|
|
|
|
startx= mval[0]-width/2;
|
|
|
|
|
starty = mval[1]-height + boxh/2 + ((a)%rows)*boxh;
|
|
|
|
|
|
|
|
|
|
if (md->title) starty+= boxh;
|
|
|
|
|
|
|
|
|
|
mousemove[0]= mousemove[1]= 0;
|
|
|
|
|
|
|
|
|
|
if(startx<10) {
|
|
|
|
|
mousemove[0]= 10-startx;
|
|
|
|
|
startx= 10;
|
|
|
|
|
}
|
|
|
|
|
if(starty<10) {
|
|
|
|
|
mousemove[1]= 10-starty;
|
|
|
|
|
starty= 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
endx= startx+width*columns;
|
|
|
|
|
endy= starty+height;
|
|
|
|
|
|
|
|
|
|
if(endx>xmax) {
|
|
|
|
|
mousemove[0]= xmax-endx-10;
|
|
|
|
|
endx= xmax-10;
|
|
|
|
|
startx= endx-width*columns;
|
|
|
|
|
}
|
|
|
|
|
if(endy>ymax) {
|
|
|
|
|
mousemove[1]= ymax-endy-10;
|
|
|
|
|
endy= ymax-10;
|
|
|
|
|
starty= endy-height;
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-10 20:34:41 +00:00
|
|
|
ui_warp_pointer(mval[0]+mousemove[0], mval[1]+mousemove[1]);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
mousemove[0]= mval[0];
|
|
|
|
|
mousemove[1]= mval[1];
|
|
|
|
|
|
|
|
|
|
/* here we go! */
|
|
|
|
|
|
|
|
|
|
if(md->title) {
|
|
|
|
|
uiBut *bt;
|
|
|
|
|
uiSetCurFont(block, UI_HELVB);
|
|
|
|
|
bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+rows*boxh), (short)width, (short)boxh, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
uiSetCurFont(block, UI_HELV);
|
|
|
|
|
bt->flag= UI_TEXT_LEFT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for(a=0; a<md->nitems; a++) {
|
2003-11-05 23:54:22 +00:00
|
|
|
char *name= md->items[a].str;
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
x1= startx + width*((int)a/rows);
|
|
|
|
|
y1= starty - boxh*(a%rows) + (rows-1)*boxh;
|
2003-11-05 23:54:22 +00:00
|
|
|
|
|
|
|
|
if( strcmp(name, "%l")==0){
|
|
|
|
|
uiDefBut(block, SEPR, B_NOP, "", x1, y1, width, 6, NULL, 0, 0.0, 0, 0, "");
|
|
|
|
|
y1 -= 6;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2003-11-12 21:34:12 +00:00
|
|
|
uiDefButI(block, BUTM, B_NOP, name, x1, y1, width, boxh-1, &val, (float) md->items[a].retval, 0.0, 0, 0, "");
|
2003-11-05 23:54:22 +00:00
|
|
|
y1 -= boxh;
|
|
|
|
|
}
|
|
|
|
|
//uiDefButI(block, BUTM, B_NOP, md->items[a].str, x1, y1, (short)(width-(rows>1)), (short)(boxh-1), &val, (float)md->items[a].retval, 0.0, 0, 0, "");
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiBoundsBlock(block, 3);
|
|
|
|
|
|
|
|
|
|
event= uiDoBlocks(&listb, 0);
|
|
|
|
|
|
|
|
|
|
menudata_free(md);
|
|
|
|
|
|
2003-07-10 20:34:41 +00:00
|
|
|
if((event & UI_RETURN_OUT)==0) ui_warp_pointer(mousemove[0], mousemove[1]);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|