2009-03-25 16:58:42 +00:00
|
|
|
/**
|
|
|
|
* ***** BEGIN GPL 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.
|
|
|
|
*
|
|
|
|
* 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) 2009 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Contributor(s): Blender Foundation
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <limits.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
#include "DNA_ID.h"
|
|
|
|
#include "DNA_screen_types.h"
|
2009-04-09 18:11:18 +00:00
|
|
|
#include "DNA_userdef_types.h"
|
2009-03-25 16:58:42 +00:00
|
|
|
#include "DNA_windowmanager_types.h"
|
|
|
|
|
2009-11-10 20:43:45 +00:00
|
|
|
#include "BLI_math.h"
|
2009-03-25 16:58:42 +00:00
|
|
|
#include "BLI_listbase.h"
|
|
|
|
#include "BLI_rect.h"
|
|
|
|
|
|
|
|
#include "BKE_context.h"
|
2009-06-17 11:01:05 +00:00
|
|
|
#include "BKE_curve.h"
|
2009-03-25 16:58:42 +00:00
|
|
|
#include "BKE_global.h"
|
|
|
|
#include "BKE_utildefines.h"
|
|
|
|
|
|
|
|
#include "BIF_gl.h"
|
2009-04-03 16:26:03 +00:00
|
|
|
#include "BIF_glutil.h"
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-10 14:06:24 +00:00
|
|
|
#include "BLF_api.h"
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
#include "UI_interface.h"
|
|
|
|
#include "UI_interface_icons.h"
|
|
|
|
#include "UI_resources.h"
|
|
|
|
#include "UI_view2d.h"
|
|
|
|
|
|
|
|
#include "ED_util.h"
|
|
|
|
#include "ED_types.h"
|
|
|
|
|
|
|
|
#include "interface_intern.h"
|
|
|
|
|
|
|
|
/* ************** widget base functions ************** */
|
|
|
|
/*
|
|
|
|
- in: roundbox codes for corner types and radius
|
|
|
|
- return: array of [size][2][x,y] points, the edges of the roundbox, + UV coords
|
|
|
|
|
|
|
|
- draw black box with alpha 0 on exact button boundbox
|
|
|
|
- for ever AA step:
|
|
|
|
- draw the inner part for a round filled box, with color blend codes or texture coords
|
|
|
|
- draw outline in outline color
|
|
|
|
- draw outer part, bottom half, extruded 1 pixel to bottom, for emboss shadow
|
|
|
|
- draw extra decorations
|
|
|
|
- draw background color box with alpha 1 on exact button boundbox
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* fill this struct with polygon info to draw AA'ed */
|
|
|
|
/* it has outline, back, and two optional tria meshes */
|
|
|
|
|
|
|
|
typedef struct uiWidgetTrias {
|
|
|
|
int tot;
|
|
|
|
|
|
|
|
float vec[32][2];
|
|
|
|
int (*index)[3];
|
|
|
|
|
|
|
|
} uiWidgetTrias;
|
|
|
|
|
|
|
|
typedef struct uiWidgetBase {
|
|
|
|
|
|
|
|
int totvert, halfwayvert;
|
|
|
|
float outer_v[64][2];
|
|
|
|
float inner_v[64][2];
|
|
|
|
float inner_uv[64][2];
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
short inner, outline, emboss; /* set on/off */
|
2009-06-24 14:16:56 +00:00
|
|
|
short shadedir;
|
2009-04-02 18:16:15 +00:00
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
uiWidgetTrias tria1;
|
|
|
|
uiWidgetTrias tria2;
|
|
|
|
|
|
|
|
} uiWidgetBase;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* uiWidgetType: for time being only for visual appearance,
|
|
|
|
later, a handling callback can be added too
|
|
|
|
*/
|
|
|
|
typedef struct uiWidgetType {
|
|
|
|
|
|
|
|
/* pointer to theme color definition */
|
|
|
|
uiWidgetColors *wcol_theme;
|
2009-07-12 02:06:15 +00:00
|
|
|
uiWidgetStateColors *wcol_state;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
/* converted colors for state */
|
|
|
|
uiWidgetColors wcol;
|
|
|
|
|
|
|
|
void (*state)(struct uiWidgetType *, int state);
|
|
|
|
void (*draw)(uiWidgetColors *, rcti *, int state, int roundboxalign);
|
2009-04-02 18:16:15 +00:00
|
|
|
void (*custom)(uiBut *, uiWidgetColors *, rcti *, int state, int roundboxalign);
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
void (*text)(uiFontStyle *, uiWidgetColors *, uiBut *, rcti *);
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
} uiWidgetType;
|
|
|
|
|
|
|
|
|
|
|
|
/* *********************** draw data ************************** */
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
static float cornervec[9][2]= {{0.0, 0.0}, {0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169},
|
|
|
|
{0.707, 0.293}, {0.831, 0.45}, {0.924, 0.617}, {0.98, 0.805}, {1.0, 1.0}};
|
|
|
|
|
|
|
|
static float jit[8][2]= {{0.468813 , -0.481430}, {-0.155755 , -0.352820},
|
|
|
|
{0.219306 , -0.238501}, {-0.393286 , -0.110949}, {-0.024699 , 0.013908},
|
|
|
|
{0.343805 , 0.147431}, {-0.272855 , 0.269918}, {0.095909 , 0.388710}};
|
|
|
|
|
2009-09-14 12:28:59 +00:00
|
|
|
static float num_tria_vert[3][2]= {
|
|
|
|
{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.330000, -0.008353}};
|
|
|
|
|
|
|
|
static int num_tria_face[1][3]= {
|
|
|
|
{0, 1, 2}};
|
|
|
|
|
|
|
|
static float scroll_circle_vert[16][2]= {
|
2009-03-25 16:58:42 +00:00
|
|
|
{0.382684, 0.923879}, {0.000001, 1.000000}, {-0.382683, 0.923880}, {-0.707107, 0.707107},
|
|
|
|
{-0.923879, 0.382684}, {-1.000000, 0.000000}, {-0.923880, -0.382684}, {-0.707107, -0.707107},
|
|
|
|
{-0.382683, -0.923880}, {0.000000, -1.000000}, {0.382684, -0.923880}, {0.707107, -0.707107},
|
2009-09-14 12:28:59 +00:00
|
|
|
{0.923880, -0.382684}, {1.000000, -0.000000}, {0.923880, 0.382683}, {0.707107, 0.707107}};
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-09-14 12:28:59 +00:00
|
|
|
static int scroll_circle_face[14][3]= {
|
|
|
|
{0, 1, 2}, {2, 0, 3}, {3, 0, 15}, {3, 15, 4}, {4, 15, 14}, {4, 14, 5}, {5, 14, 13}, {5, 13, 6},
|
|
|
|
{6, 13, 12}, {6, 12, 7}, {7, 12, 11}, {7, 11, 8}, {8, 11, 10}, {8, 10, 9}};
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
static float menu_tria_vert[6][2]= {
|
|
|
|
{-0.41, 0.16}, {0.41, 0.16}, {0, 0.82},
|
|
|
|
{0, -0.82}, {-0.41, -0.16}, {0.41, -0.16}};
|
|
|
|
|
|
|
|
static int menu_tria_face[2][3]= {{2, 0, 1}, {3, 5, 4}};
|
|
|
|
|
|
|
|
static float check_tria_vert[6][2]= {
|
|
|
|
{-0.578579, 0.253369}, {-0.392773, 0.412794}, {-0.004241, -0.328551},
|
|
|
|
{-0.003001, 0.034320}, {1.055313, 0.864744}, {0.866408, 1.026895}};
|
|
|
|
|
|
|
|
static int check_tria_face[4][3]= {
|
|
|
|
{3, 2, 4}, {3, 4, 5}, {1, 0, 3}, {0, 2, 3}};
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* ************************************************* */
|
|
|
|
|
|
|
|
void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3)
|
|
|
|
{
|
|
|
|
float color[4];
|
|
|
|
int j;
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glGetFloatv(GL_CURRENT_COLOR, color);
|
|
|
|
color[3]= 0.125;
|
|
|
|
glColor4fv(color);
|
|
|
|
|
|
|
|
/* for each AA step */
|
|
|
|
for(j=0; j<8; j++) {
|
|
|
|
glTranslatef(1.0*jit[j][0], 1.0*jit[j][1], 0.0f);
|
|
|
|
|
|
|
|
glBegin(GL_POLYGON);
|
|
|
|
glVertex2f(x1, y1);
|
|
|
|
glVertex2f(x2, y2);
|
|
|
|
glVertex2f(x3, y3);
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
glTranslatef(-1.0*jit[j][0], -1.0*jit[j][1], 0.0f);
|
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
static void widget_init(uiWidgetBase *wtb)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 18:16:15 +00:00
|
|
|
wtb->totvert= wtb->halfwayvert= 0;
|
|
|
|
wtb->tria1.tot= 0;
|
|
|
|
wtb->tria2.tot= 0;
|
|
|
|
|
|
|
|
wtb->inner= 1;
|
|
|
|
wtb->outline= 1;
|
2009-04-03 16:26:03 +00:00
|
|
|
wtb->emboss= 1;
|
2009-06-24 14:16:56 +00:00
|
|
|
wtb->shadedir= 1;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* helper call, makes shadow rect, with 'sun' above menu, so only shadow to left/right/bottom */
|
|
|
|
/* return tot */
|
2009-04-15 14:43:54 +00:00
|
|
|
static int round_box_shadow_edges(float (*vert)[2], rcti *rect, float rad, int roundboxalign, float step)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
|
|
|
float vec[9][2];
|
|
|
|
float minx, miny, maxx, maxy;
|
|
|
|
int a, tot= 0;
|
|
|
|
|
2009-04-15 14:43:54 +00:00
|
|
|
rad+= step;
|
|
|
|
|
|
|
|
if(2.0f*rad > rect->ymax-rect->ymin)
|
|
|
|
rad= 0.5f*(rect->ymax-rect->ymin);
|
|
|
|
|
|
|
|
minx= rect->xmin-step;
|
|
|
|
miny= rect->ymin-step;
|
|
|
|
maxx= rect->xmax+step;
|
|
|
|
maxy= rect->ymax+step;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
/* mult */
|
|
|
|
for(a=0; a<9; a++) {
|
|
|
|
vec[a][0]= rad*cornervec[a][0];
|
|
|
|
vec[a][1]= rad*cornervec[a][1];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* start with left-top, anti clockwise */
|
|
|
|
if(roundboxalign & 1) {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= minx+rad-vec[a][0];
|
|
|
|
vert[tot][1]= maxy-vec[a][1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= minx;
|
|
|
|
vert[tot][1]= maxy;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(roundboxalign & 8) {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= minx+vec[a][1];
|
|
|
|
vert[tot][1]= miny+rad-vec[a][0];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= minx;
|
|
|
|
vert[tot][1]= miny;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(roundboxalign & 4) {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= maxx-rad+vec[a][0];
|
|
|
|
vert[tot][1]= miny+vec[a][1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= maxx;
|
|
|
|
vert[tot][1]= miny;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(roundboxalign & 2) {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= maxx-vec[a][1];
|
|
|
|
vert[tot][1]= maxy-rad+vec[a][0];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
vert[tot][0]= maxx;
|
|
|
|
vert[tot][1]= maxy;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return tot;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-06-08 12:39:39 +00:00
|
|
|
/* this call has 1 extra arg to allow mask outline */
|
|
|
|
static void round_box__edges(uiWidgetBase *wt, int roundboxalign, rcti *rect, float rad, float radi)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
|
|
|
float vec[9][2], veci[9][2];
|
|
|
|
float minx= rect->xmin, miny= rect->ymin, maxx= rect->xmax, maxy= rect->ymax;
|
|
|
|
float minxi= minx + 1.0f; /* boundbox inner */
|
|
|
|
float maxxi= maxx - 1.0f;
|
|
|
|
float minyi= miny + 1.0f;
|
|
|
|
float maxyi= maxy - 1.0f;
|
|
|
|
float facxi= 1.0f/(maxxi-minxi); /* for uv */
|
|
|
|
float facyi= 1.0f/(maxyi-minyi);
|
2009-07-02 11:23:19 +00:00
|
|
|
int a, tot= 0, minsize;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-07-02 11:23:19 +00:00
|
|
|
minsize= MIN2(rect->xmax-rect->xmin, rect->ymax-rect->ymin);
|
|
|
|
|
|
|
|
if(2.0f*rad > minsize)
|
|
|
|
rad= 0.5f*minsize;
|
2009-04-15 14:43:54 +00:00
|
|
|
|
2009-07-02 11:23:19 +00:00
|
|
|
if(2.0f*(radi+1.0f) > minsize)
|
|
|
|
radi= 0.5f*minsize - 1.0f;
|
2009-04-15 14:43:54 +00:00
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* mult */
|
|
|
|
for(a=0; a<9; a++) {
|
|
|
|
veci[a][0]= radi*cornervec[a][0];
|
|
|
|
veci[a][1]= radi*cornervec[a][1];
|
|
|
|
vec[a][0]= rad*cornervec[a][0];
|
|
|
|
vec[a][1]= rad*cornervec[a][1];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* corner left-bottom */
|
2009-04-02 15:01:11 +00:00
|
|
|
if(roundboxalign & 8) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0]= minxi+veci[a][1];
|
|
|
|
wt->inner_v[tot][1]= minyi+radi-veci[a][0];
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= minx+vec[a][1];
|
|
|
|
wt->outer_v[tot][1]= miny+rad-vec[a][0];
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= facxi*(wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1]= facyi*(wt->inner_v[tot][1] - minyi);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
wt->inner_v[tot][0]= minxi;
|
|
|
|
wt->inner_v[tot][1]= minyi;
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= minx;
|
|
|
|
wt->outer_v[tot][1]= miny;
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= 0.0f;
|
|
|
|
wt->inner_uv[tot][1]= 0.0f;
|
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* corner right-bottom */
|
2009-04-02 15:01:11 +00:00
|
|
|
if(roundboxalign & 4) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0]= maxxi-radi+veci[a][0];
|
|
|
|
wt->inner_v[tot][1]= minyi+veci[a][1];
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= maxx-rad+vec[a][0];
|
|
|
|
wt->outer_v[tot][1]= miny+vec[a][1];
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= facxi*(wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1]= facyi*(wt->inner_v[tot][1] - minyi);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
wt->inner_v[tot][0]= maxxi;
|
|
|
|
wt->inner_v[tot][1]= minyi;
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= maxx;
|
|
|
|
wt->outer_v[tot][1]= miny;
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= 1.0f;
|
|
|
|
wt->inner_uv[tot][1]= 0.0f;
|
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wt->halfwayvert= tot;
|
|
|
|
|
|
|
|
/* corner right-top */
|
2009-04-02 15:01:11 +00:00
|
|
|
if(roundboxalign & 2) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0]= maxxi-veci[a][1];
|
|
|
|
wt->inner_v[tot][1]= maxyi-radi+veci[a][0];
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= maxx-vec[a][1];
|
|
|
|
wt->outer_v[tot][1]= maxy-rad+vec[a][0];
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= facxi*(wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1]= facyi*(wt->inner_v[tot][1] - minyi);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
wt->inner_v[tot][0]= maxxi;
|
|
|
|
wt->inner_v[tot][1]= maxyi;
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= maxx;
|
|
|
|
wt->outer_v[tot][1]= maxy;
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= 1.0f;
|
|
|
|
wt->inner_uv[tot][1]= 1.0f;
|
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* corner left-top */
|
2009-04-02 15:01:11 +00:00
|
|
|
if(roundboxalign & 1) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
for(a=0; a<9; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0]= minxi+radi-veci[a][0];
|
|
|
|
wt->inner_v[tot][1]= maxyi-veci[a][1];
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= minx+rad-vec[a][0];
|
|
|
|
wt->outer_v[tot][1]= maxy-vec[a][1];
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= facxi*(wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1]= facyi*(wt->inner_v[tot][1] - minyi);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
wt->inner_v[tot][0]= minxi;
|
|
|
|
wt->inner_v[tot][1]= maxyi;
|
|
|
|
|
|
|
|
wt->outer_v[tot][0]= minx;
|
|
|
|
wt->outer_v[tot][1]= maxy;
|
|
|
|
|
|
|
|
wt->inner_uv[tot][0]= 0.0f;
|
|
|
|
wt->inner_uv[tot][1]= 1.0f;
|
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wt->totvert= tot;
|
|
|
|
}
|
|
|
|
|
2009-06-08 12:39:39 +00:00
|
|
|
static void round_box_edges(uiWidgetBase *wt, int roundboxalign, rcti *rect, float rad)
|
|
|
|
{
|
|
|
|
round_box__edges(wt, roundboxalign, rect, rad, rad-1.0f);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* based on button rect, return scaled array of triangles */
|
|
|
|
static void widget_num_tria(uiWidgetTrias *tria, rcti *rect, float triasize, char where)
|
|
|
|
{
|
2009-07-03 13:21:09 +00:00
|
|
|
float centx, centy, sizex, sizey, minsize;
|
|
|
|
int a, i1=0, i2=1;
|
|
|
|
|
|
|
|
minsize= MIN2(rect->xmax-rect->xmin, rect->ymax-rect->ymin);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* center position and size */
|
2009-07-03 13:21:09 +00:00
|
|
|
centx= (float)rect->xmin + 0.5f*minsize;
|
|
|
|
centy= (float)rect->ymin + 0.5f*minsize;
|
|
|
|
sizex= sizey= -0.5f*triasize*minsize;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
if(where=='r') {
|
2009-07-03 13:21:09 +00:00
|
|
|
centx= (float)rect->xmax - 0.5f*minsize;
|
|
|
|
sizex= -sizex;
|
|
|
|
}
|
|
|
|
else if(where=='t') {
|
|
|
|
centy= (float)rect->ymax - 0.5f*minsize;
|
|
|
|
sizey= -sizey;
|
|
|
|
i2=0; i1= 1;
|
|
|
|
}
|
|
|
|
else if(where=='b') {
|
|
|
|
sizex= -sizex;
|
|
|
|
i2=0; i1= 1;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-09-14 12:28:59 +00:00
|
|
|
for(a=0; a<3; a++) {
|
2009-07-03 13:21:09 +00:00
|
|
|
tria->vec[a][0]= sizex*num_tria_vert[a][i1] + centx;
|
|
|
|
tria->vec[a][1]= sizey*num_tria_vert[a][i2] + centy;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-09-14 12:28:59 +00:00
|
|
|
tria->tot= 1;
|
2009-03-25 16:58:42 +00:00
|
|
|
tria->index= num_tria_face;
|
|
|
|
}
|
|
|
|
|
2009-09-14 12:28:59 +00:00
|
|
|
static void widget_scroll_circle(uiWidgetTrias *tria, rcti *rect, float triasize, char where)
|
|
|
|
{
|
|
|
|
float centx, centy, sizex, sizey, minsize;
|
|
|
|
int a, i1=0, i2=1;
|
|
|
|
|
|
|
|
minsize= MIN2(rect->xmax-rect->xmin, rect->ymax-rect->ymin);
|
|
|
|
|
|
|
|
/* center position and size */
|
|
|
|
centx= (float)rect->xmin + 0.5f*minsize;
|
|
|
|
centy= (float)rect->ymin + 0.5f*minsize;
|
|
|
|
sizex= sizey= -0.5f*triasize*minsize;
|
|
|
|
|
|
|
|
if(where=='r') {
|
|
|
|
centx= (float)rect->xmax - 0.5f*minsize;
|
|
|
|
sizex= -sizex;
|
|
|
|
}
|
|
|
|
else if(where=='t') {
|
|
|
|
centy= (float)rect->ymax - 0.5f*minsize;
|
|
|
|
sizey= -sizey;
|
|
|
|
i2=0; i1= 1;
|
|
|
|
}
|
|
|
|
else if(where=='b') {
|
|
|
|
sizex= -sizex;
|
|
|
|
i2=0; i1= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(a=0; a<16; a++) {
|
|
|
|
tria->vec[a][0]= sizex*scroll_circle_vert[a][i1] + centx;
|
|
|
|
tria->vec[a][1]= sizey*scroll_circle_vert[a][i2] + centy;
|
|
|
|
}
|
|
|
|
|
|
|
|
tria->tot= 14;
|
|
|
|
tria->index= scroll_circle_face;
|
|
|
|
}
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
static void widget_trias_draw(uiWidgetTrias *tria)
|
|
|
|
{
|
|
|
|
int a;
|
|
|
|
|
|
|
|
glBegin(GL_TRIANGLES);
|
|
|
|
for(a=0; a<tria->tot; a++) {
|
|
|
|
glVertex2fv(tria->vec[ tria->index[a][0] ]);
|
|
|
|
glVertex2fv(tria->vec[ tria->index[a][1] ]);
|
|
|
|
glVertex2fv(tria->vec[ tria->index[a][2] ]);
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void widget_menu_trias(uiWidgetTrias *tria, rcti *rect)
|
|
|
|
{
|
2009-04-03 16:26:03 +00:00
|
|
|
float centx, centy, size, asp;
|
2009-03-25 16:58:42 +00:00
|
|
|
int a;
|
|
|
|
|
|
|
|
/* center position and size */
|
|
|
|
centx= rect->xmax - 0.5f*(rect->ymax-rect->ymin);
|
|
|
|
centy= rect->ymin + 0.5f*(rect->ymax-rect->ymin);
|
|
|
|
size= 0.4f*(rect->ymax-rect->ymin);
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* XXX exception */
|
|
|
|
asp= ((float)rect->xmax-rect->xmin)/((float)rect->ymax-rect->ymin);
|
|
|
|
if(asp > 1.2f && asp < 2.6f)
|
|
|
|
centx= rect->xmax - 0.3f*(rect->ymax-rect->ymin);
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
for(a=0; a<6; a++) {
|
|
|
|
tria->vec[a][0]= size*menu_tria_vert[a][0] + centx;
|
|
|
|
tria->vec[a][1]= size*menu_tria_vert[a][1] + centy;
|
|
|
|
}
|
|
|
|
|
|
|
|
tria->tot= 2;
|
|
|
|
tria->index= menu_tria_face;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void widget_check_trias(uiWidgetTrias *tria, rcti *rect)
|
|
|
|
{
|
|
|
|
float centx, centy, size;
|
|
|
|
int a;
|
|
|
|
|
|
|
|
/* center position and size */
|
|
|
|
centx= rect->xmin + 0.5f*(rect->ymax-rect->ymin);
|
|
|
|
centy= rect->ymin + 0.5f*(rect->ymax-rect->ymin);
|
|
|
|
size= 0.5f*(rect->ymax-rect->ymin);
|
|
|
|
|
|
|
|
for(a=0; a<6; a++) {
|
|
|
|
tria->vec[a][0]= size*check_tria_vert[a][0] + centx;
|
|
|
|
tria->vec[a][1]= size*check_tria_vert[a][1] + centy;
|
|
|
|
}
|
|
|
|
|
|
|
|
tria->tot= 4;
|
|
|
|
tria->index= check_tria_face;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* prepares shade colors */
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
static void shadecolors4(char *coltop, char *coldown, char *color, short shadetop, short shadedown)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
coltop[0]= CLAMPIS(color[0]+shadetop, 0, 255);
|
|
|
|
coltop[1]= CLAMPIS(color[1]+shadetop, 0, 255);
|
|
|
|
coltop[2]= CLAMPIS(color[2]+shadetop, 0, 255);
|
2009-04-03 16:26:03 +00:00
|
|
|
coltop[3]= color[3];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
coldown[0]= CLAMPIS(color[0]+shadedown, 0, 255);
|
|
|
|
coldown[1]= CLAMPIS(color[1]+shadedown, 0, 255);
|
|
|
|
coldown[2]= CLAMPIS(color[2]+shadedown, 0, 255);
|
2009-07-02 18:12:46 +00:00
|
|
|
coldown[3]= color[3];
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
static void round_box_shade_col4(char *col1, char *col2, float fac)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
int faci, facm;
|
2009-07-21 01:26:17 +00:00
|
|
|
unsigned char col[4];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
faci= floor(255.1f*fac);
|
|
|
|
facm= 255-faci;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
col[0]= (faci*col1[0] + facm*col2[0])>>8;
|
|
|
|
col[1]= (faci*col1[1] + facm*col2[1])>>8;
|
|
|
|
col[2]= (faci*col1[2] + facm*col2[2])>>8;
|
|
|
|
col[3]= (faci*col1[3] + facm*col2[3])>>8;
|
|
|
|
|
|
|
|
glColor4ubv(col);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-06-08 12:39:39 +00:00
|
|
|
static void widgetbase_outline(uiWidgetBase *wtb)
|
|
|
|
{
|
|
|
|
int a;
|
|
|
|
|
|
|
|
/* outline */
|
|
|
|
glBegin(GL_QUAD_STRIP);
|
|
|
|
for(a=0; a<wtb->totvert; a++) {
|
|
|
|
glVertex2fv(wtb->outer_v[a]);
|
|
|
|
glVertex2fv(wtb->inner_v[a]);
|
|
|
|
}
|
|
|
|
glVertex2fv(wtb->outer_v[0]);
|
|
|
|
glVertex2fv(wtb->inner_v[0]);
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
|
|
|
int j, a;
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
|
|
|
/* backdrop non AA */
|
2009-04-02 18:16:15 +00:00
|
|
|
if(wtb->inner) {
|
|
|
|
if(wcol->shaded==0) {
|
2009-06-08 10:00:14 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
/* filled center, solid */
|
2009-07-21 01:26:17 +00:00
|
|
|
glColor4ubv((unsigned char*)wcol->inner);
|
2009-04-02 18:16:15 +00:00
|
|
|
glBegin(GL_POLYGON);
|
|
|
|
for(a=0; a<wtb->totvert; a++)
|
|
|
|
glVertex2fv(wtb->inner_v[a]);
|
|
|
|
glEnd();
|
2009-06-08 10:00:14 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
}
|
|
|
|
else {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
char col1[4], col2[4];
|
2009-04-02 18:16:15 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
shadecolors4(col1, col2, wcol->inner, wcol->shadetop, wcol->shadedown);
|
2009-04-02 18:16:15 +00:00
|
|
|
|
|
|
|
glShadeModel(GL_SMOOTH);
|
|
|
|
glBegin(GL_POLYGON);
|
|
|
|
for(a=0; a<wtb->totvert; a++) {
|
2009-06-24 14:16:56 +00:00
|
|
|
round_box_shade_col4(col1, col2, wtb->inner_uv[a][wtb->shadedir]);
|
2009-04-02 18:16:15 +00:00
|
|
|
glVertex2fv(wtb->inner_v[a]);
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
glShadeModel(GL_FLAT);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* for each AA step */
|
2009-04-02 18:16:15 +00:00
|
|
|
if(wtb->outline) {
|
|
|
|
for(j=0; j<8; j++) {
|
|
|
|
glTranslatef(1.0*jit[j][0], 1.0*jit[j][1], 0.0f);
|
|
|
|
|
|
|
|
/* outline */
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
glColor4ub(wcol->outline[0], wcol->outline[1], wcol->outline[2], 32);
|
2009-04-02 18:16:15 +00:00
|
|
|
glBegin(GL_QUAD_STRIP);
|
|
|
|
for(a=0; a<wtb->totvert; a++) {
|
|
|
|
glVertex2fv(wtb->outer_v[a]);
|
|
|
|
glVertex2fv(wtb->inner_v[a]);
|
|
|
|
}
|
|
|
|
glVertex2fv(wtb->outer_v[0]);
|
|
|
|
glVertex2fv(wtb->inner_v[0]);
|
|
|
|
glEnd();
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
/* emboss bottom shadow */
|
2009-04-03 16:26:03 +00:00
|
|
|
if(wtb->emboss) {
|
|
|
|
glColor4f(1.0f, 1.0f, 1.0f, 0.02f);
|
|
|
|
glBegin(GL_QUAD_STRIP);
|
|
|
|
for(a=0; a<wtb->halfwayvert; a++) {
|
|
|
|
glVertex2fv(wtb->outer_v[a]);
|
|
|
|
glVertex2f(wtb->outer_v[a][0], wtb->outer_v[a][1]-1.0f);
|
|
|
|
}
|
|
|
|
glEnd();
|
2009-04-02 18:16:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glTranslatef(-1.0*jit[j][0], -1.0*jit[j][1], 0.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* decoration */
|
2009-04-02 18:16:15 +00:00
|
|
|
if(wtb->tria1.tot || wtb->tria2.tot) {
|
2009-03-25 16:58:42 +00:00
|
|
|
/* for each AA step */
|
|
|
|
for(j=0; j<8; j++) {
|
|
|
|
glTranslatef(1.0*jit[j][0], 1.0*jit[j][1], 0.0f);
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
if(wtb->tria1.tot) {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
glColor4ub(wcol->item[0], wcol->item[1], wcol->item[2], 32);
|
2009-04-02 18:16:15 +00:00
|
|
|
widget_trias_draw(&wtb->tria1);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
2009-04-02 18:16:15 +00:00
|
|
|
if(wtb->tria2.tot) {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
glColor4ub(wcol->item[0], wcol->item[1], wcol->item[2], 32);
|
2009-04-02 18:16:15 +00:00
|
|
|
widget_trias_draw(&wtb->tria2);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glTranslatef(-1.0*jit[j][0], -1.0*jit[j][1], 0.0f);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* *********************** text/icon ************************************** */
|
|
|
|
|
2009-04-07 17:08:26 +00:00
|
|
|
|
|
|
|
/* icons have been standardized... and this call draws in untransformed coordinates */
|
|
|
|
#define ICON_HEIGHT 16.0f
|
|
|
|
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
static void widget_draw_icon(uiBut *but, BIFIconID icon, float alpha, rcti *rect)
|
2009-04-07 17:08:26 +00:00
|
|
|
{
|
2009-06-04 15:19:48 +00:00
|
|
|
int xs=0, ys=0;
|
|
|
|
float aspect, height;
|
2009-04-07 17:08:26 +00:00
|
|
|
|
|
|
|
/* this icon doesn't need draw... */
|
2009-04-30 17:27:30 +00:00
|
|
|
if(icon==ICON_BLANK1 && (but->flag & UI_ICON_SUBMENU)==0) return;
|
2009-04-07 17:08:26 +00:00
|
|
|
|
|
|
|
/* we need aspect from block, for menus... these buttons are scaled in uiPositionBlock() */
|
|
|
|
aspect= but->block->aspect;
|
|
|
|
if(aspect != but->aspect) {
|
|
|
|
/* prevent scaling up icon in pupmenu */
|
|
|
|
if (aspect < 1.0f) {
|
|
|
|
height= ICON_HEIGHT;
|
|
|
|
aspect = 1.0f;
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
height= ICON_HEIGHT/aspect;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
height= ICON_HEIGHT;
|
|
|
|
|
2009-04-30 17:27:30 +00:00
|
|
|
/* calculate blend color */
|
2009-07-21 01:26:17 +00:00
|
|
|
if ELEM4(but->type, TOG, ROW, TOGN, LISTROW) {
|
2009-04-30 17:27:30 +00:00
|
|
|
if(but->flag & UI_SELECT);
|
|
|
|
else if(but->flag & UI_ACTIVE);
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
else alpha= 0.5f;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
|
|
|
if(icon && icon!=ICON_BLANK1) {
|
|
|
|
if(but->flag & UI_ICON_LEFT) {
|
|
|
|
if (but->type==BUT_TOGDUAL) {
|
|
|
|
if (but->drawstr[0]) {
|
2009-06-04 15:19:48 +00:00
|
|
|
xs= rect->xmin-1;
|
2009-04-30 17:27:30 +00:00
|
|
|
} else {
|
2009-06-04 15:19:48 +00:00
|
|
|
xs= (rect->xmin+rect->xmax- height)/2;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
2009-04-30 17:27:30 +00:00
|
|
|
else if (but->block->flag & UI_BLOCK_LOOP) {
|
2009-06-05 16:11:18 +00:00
|
|
|
if(but->type==SEARCH_MENU)
|
|
|
|
xs= rect->xmin+4;
|
|
|
|
else
|
|
|
|
xs= rect->xmin+1;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
|
|
|
else if ((but->type==ICONROW) || (but->type==ICONTEXTROW)) {
|
2009-06-04 15:19:48 +00:00
|
|
|
xs= rect->xmin+3;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-06-04 15:19:48 +00:00
|
|
|
xs= rect->xmin+4;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
2009-06-04 15:19:48 +00:00
|
|
|
ys= (rect->ymin+rect->ymax- height)/2;
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-06-04 15:19:48 +00:00
|
|
|
xs= (rect->xmin+rect->xmax- height)/2;
|
|
|
|
ys= (rect->ymin+rect->ymax- height)/2;
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
2009-04-30 17:27:30 +00:00
|
|
|
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
UI_icon_draw_aspect(xs, ys, icon, aspect, alpha);
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
2009-04-30 17:27:30 +00:00
|
|
|
|
|
|
|
if(but->flag & UI_ICON_SUBMENU) {
|
2009-06-04 15:19:48 +00:00
|
|
|
xs= rect->xmax-17;
|
|
|
|
ys= (rect->ymin+rect->ymax- height)/2;
|
2009-04-30 17:27:30 +00:00
|
|
|
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
UI_icon_draw_aspect(xs, ys, ICON_RIGHTARROW_THIN, aspect, alpha);
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
2009-04-10 14:06:24 +00:00
|
|
|
/* sets but->ofs to make sure text is correctly visible */
|
|
|
|
static void ui_text_leftclip(uiFontStyle *fstyle, uiBut *but, rcti *rect)
|
|
|
|
{
|
2009-09-21 21:26:04 +00:00
|
|
|
int border= (but->flag & UI_BUT_ALIGN_RIGHT)? 8: 10;
|
|
|
|
int okwidth= rect->xmax-rect->xmin - border;
|
2009-04-10 14:06:24 +00:00
|
|
|
|
|
|
|
/* need to set this first */
|
|
|
|
uiStyleFontSet(fstyle);
|
2009-04-07 17:08:26 +00:00
|
|
|
|
2009-04-10 14:06:24 +00:00
|
|
|
but->strwidth= BLF_width(but->drawstr);
|
|
|
|
but->ofs= 0;
|
|
|
|
|
|
|
|
while(but->strwidth > okwidth ) {
|
|
|
|
|
|
|
|
but->ofs++;
|
|
|
|
but->strwidth= BLF_width(but->drawstr+but->ofs);
|
|
|
|
|
|
|
|
/* textbut exception */
|
|
|
|
if(but->editstr && but->pos != -1) {
|
2009-07-28 17:59:59 +00:00
|
|
|
int pos= but->pos+1;
|
2009-04-10 14:06:24 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(but->strwidth < 10) break;
|
|
|
|
}
|
|
|
|
}
|
2009-04-07 17:08:26 +00:00
|
|
|
|
2009-11-11 10:27:25 +00:00
|
|
|
static void ui_text_label_rightclip(uiFontStyle *fstyle, uiBut *but, rcti *rect)
|
|
|
|
{
|
|
|
|
int border= (but->flag & UI_BUT_ALIGN_RIGHT)? 8: 10;
|
|
|
|
int okwidth= rect->xmax-rect->xmin - border;
|
|
|
|
char *cpoin=NULL;
|
2009-11-12 00:48:44 +00:00
|
|
|
char *cpend = but->drawstr + strlen(but->drawstr);
|
2009-11-11 10:27:25 +00:00
|
|
|
|
|
|
|
/* need to set this first */
|
|
|
|
uiStyleFontSet(fstyle);
|
|
|
|
|
|
|
|
but->strwidth= BLF_width(but->drawstr);
|
|
|
|
but->ofs= 0;
|
|
|
|
|
|
|
|
/* find the space after ':' separator */
|
2009-11-12 00:48:44 +00:00
|
|
|
cpoin= strrchr(but->drawstr, ':');
|
2009-11-11 10:27:25 +00:00
|
|
|
|
2009-11-12 00:48:44 +00:00
|
|
|
if (cpoin && (cpoin < cpend-2)) {
|
|
|
|
char *cp2 = cpoin;
|
|
|
|
|
|
|
|
/* chop off the leading text, starting from the right */
|
|
|
|
while (but->strwidth > okwidth && cp2 > but->drawstr) {
|
|
|
|
/* shift the text after and including cp2 back by 1 char, +1 to include null terminator */
|
|
|
|
memmove(cp2-1, cp2, strlen(cp2)+1);
|
|
|
|
cp2--;
|
|
|
|
|
|
|
|
but->strwidth= BLF_width(but->drawstr+but->ofs);
|
|
|
|
if(but->strwidth < 10) break;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* after the leading text is gone, chop off the : and following space, with ofs */
|
|
|
|
while ((but->strwidth > okwidth) && (but->ofs < 2))
|
2009-11-11 10:27:25 +00:00
|
|
|
{
|
|
|
|
but->ofs++;
|
|
|
|
but->strwidth= BLF_width(but->drawstr+but->ofs);
|
2009-11-12 00:48:44 +00:00
|
|
|
if(but->strwidth < 10) break;
|
2009-11-11 10:27:25 +00:00
|
|
|
}
|
2009-11-12 00:48:44 +00:00
|
|
|
|
2009-11-11 10:27:25 +00:00
|
|
|
}
|
2009-11-12 00:48:44 +00:00
|
|
|
|
2009-11-11 10:27:25 +00:00
|
|
|
/* once the label's gone, chop off the least significant digits */
|
|
|
|
while(but->strwidth > okwidth ) {
|
|
|
|
int pos= strlen(but->drawstr);
|
|
|
|
|
|
|
|
but->drawstr[ pos-1 ] = 0;
|
|
|
|
pos--;
|
|
|
|
|
|
|
|
but->strwidth= BLF_width(but->drawstr+but->ofs);
|
|
|
|
if(but->strwidth < 10) break;
|
|
|
|
}
|
2009-11-12 00:48:44 +00:00
|
|
|
|
2009-11-11 10:27:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *but, rcti *rect)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-09 18:11:18 +00:00
|
|
|
// int transopts;
|
2009-05-03 02:27:36 +00:00
|
|
|
char *cpoin = NULL;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
uiStyleFontSet(fstyle);
|
|
|
|
|
|
|
|
if(but->editstr || (but->flag & UI_TEXT_LEFT))
|
|
|
|
fstyle->align= UI_STYLE_TEXT_LEFT;
|
|
|
|
else
|
|
|
|
fstyle->align= UI_STYLE_TEXT_CENTER;
|
|
|
|
|
|
|
|
/* text button selection and cursor */
|
|
|
|
if(but->editstr && but->pos != -1) {
|
2009-07-28 18:20:16 +00:00
|
|
|
short t=0, pos=0, ch;
|
2009-05-21 17:09:06 +00:00
|
|
|
short selsta_tmp, selend_tmp, selsta_draw, selwidth_draw;
|
|
|
|
|
|
|
|
if ((but->selend - but->selsta) > 0) {
|
|
|
|
/* text button selection */
|
2009-07-28 17:59:59 +00:00
|
|
|
selsta_tmp = but->selsta;
|
|
|
|
selend_tmp = but->selend;
|
2009-05-21 17:09:06 +00:00
|
|
|
|
|
|
|
if(but->drawstr[0]!=0) {
|
|
|
|
ch= but->drawstr[selsta_tmp];
|
|
|
|
but->drawstr[selsta_tmp]= 0;
|
|
|
|
|
2009-07-28 17:59:59 +00:00
|
|
|
selsta_draw = BLF_width(but->drawstr+but->ofs);
|
2009-05-21 17:09:06 +00:00
|
|
|
|
|
|
|
but->drawstr[selsta_tmp]= ch;
|
|
|
|
|
|
|
|
ch= but->drawstr[selend_tmp];
|
|
|
|
but->drawstr[selend_tmp]= 0;
|
|
|
|
|
2009-07-28 17:59:59 +00:00
|
|
|
selwidth_draw = BLF_width(but->drawstr+but->ofs);
|
2009-05-21 17:09:06 +00:00
|
|
|
|
|
|
|
but->drawstr[selend_tmp]= ch;
|
2009-07-28 17:59:59 +00:00
|
|
|
|
2009-07-21 01:26:17 +00:00
|
|
|
glColor3ubv((unsigned char*)wcol->item);
|
2009-09-21 21:26:04 +00:00
|
|
|
glRects(rect->xmin+selsta_draw, rect->ymin+2, rect->xmin+selwidth_draw, rect->ymax-2);
|
2009-05-21 17:09:06 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* text cursor */
|
2009-07-28 17:59:59 +00:00
|
|
|
pos= but->pos;
|
2009-05-21 17:09:06 +00:00
|
|
|
if(pos >= but->ofs) {
|
|
|
|
if(but->drawstr[0]!=0) {
|
|
|
|
ch= but->drawstr[pos];
|
|
|
|
but->drawstr[pos]= 0;
|
|
|
|
|
2009-07-28 17:59:59 +00:00
|
|
|
t= BLF_width(but->drawstr+but->ofs);
|
2009-05-21 17:09:06 +00:00
|
|
|
|
|
|
|
but->drawstr[pos]= ch;
|
|
|
|
}
|
2009-07-28 17:59:59 +00:00
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
glColor3ub(255,0,0);
|
|
|
|
glRects(rect->xmin+t, rect->ymin+2, rect->xmin+t+2, rect->ymax-2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// ui_rasterpos_safe(x, y, but->aspect);
|
2009-04-09 18:11:18 +00:00
|
|
|
// if(but->type==IDPOIN) transopts= 0; // no translation, of course!
|
|
|
|
// else transopts= ui_translate_buttons();
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-05-03 02:27:36 +00:00
|
|
|
/* cut string in 2 parts - only for menu entries */
|
2009-08-19 12:35:40 +00:00
|
|
|
if((but->block->flag & UI_BLOCK_LOOP)) {
|
|
|
|
if(ELEM5(but->type, SLI, NUM, TEX, NUMSLI, NUMABS)==0) {
|
|
|
|
cpoin= strchr(but->drawstr, '|');
|
|
|
|
if(cpoin) *cpoin= 0;
|
|
|
|
}
|
2009-05-03 02:27:36 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-07-21 01:26:17 +00:00
|
|
|
glColor3ubv((unsigned char*)wcol->text);
|
2009-04-10 14:06:24 +00:00
|
|
|
uiStyleFontDraw(fstyle, rect, but->drawstr+but->ofs);
|
2009-04-09 18:11:18 +00:00
|
|
|
|
2009-04-10 14:06:24 +00:00
|
|
|
/* part text right aligned */
|
2009-03-25 16:58:42 +00:00
|
|
|
if(cpoin) {
|
2009-04-10 14:06:24 +00:00
|
|
|
fstyle->align= UI_STYLE_TEXT_RIGHT;
|
|
|
|
rect->xmax-=5;
|
|
|
|
uiStyleFontDraw(fstyle, rect, cpoin+1);
|
2009-03-25 16:58:42 +00:00
|
|
|
*cpoin= '|';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draws text and icons for buttons */
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *but, rcti *rect)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
if(but==NULL) return;
|
2009-11-11 10:27:25 +00:00
|
|
|
|
|
|
|
/* clip but->drawstr to fit in available space */
|
|
|
|
if (ELEM4(but->type, NUM, NUMABS, NUMSLI, SLI)) {
|
|
|
|
ui_text_label_rightclip(fstyle, but, rect);
|
|
|
|
}
|
|
|
|
else if (but->type == TEX) {
|
2009-04-10 14:06:24 +00:00
|
|
|
ui_text_leftclip(fstyle, but, rect);
|
|
|
|
}
|
|
|
|
else but->ofs= 0;
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* check for button text label */
|
|
|
|
if (but->type == ICONTEXTROW) {
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
widget_draw_icon(but, (BIFIconID) (but->icon+but->iconadd), 1.0f, rect);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
if(but->type==BUT_TOGDUAL) {
|
|
|
|
int dualset= 0;
|
|
|
|
if(but->pointype==SHO)
|
|
|
|
dualset= BTST( *(((short *)but->poin)+1), but->bitnr);
|
|
|
|
else if(but->pointype==INT)
|
|
|
|
dualset= BTST( *(((int *)but->poin)+1), but->bitnr);
|
|
|
|
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
widget_draw_icon(but, ICON_DOT, dualset?1.0f:0.25f, rect);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-06-02 18:10:06 +00:00
|
|
|
/* If there's an icon too (made with uiDefIconTextBut) then draw the icon
|
|
|
|
and offset the text label to accomodate it */
|
|
|
|
|
|
|
|
if (but->flag & UI_HAS_ICON) {
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
widget_draw_icon(but, but->icon+but->iconadd, 1.0f, rect);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-06-16 01:08:39 +00:00
|
|
|
rect->xmin += UI_icon_get_width(but->icon+but->iconadd);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-06-02 18:10:06 +00:00
|
|
|
if(but->editstr || (but->flag & UI_TEXT_LEFT))
|
2009-08-10 20:57:12 +00:00
|
|
|
rect->xmin += 5;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
2009-07-28 17:59:59 +00:00
|
|
|
else if((but->flag & UI_TEXT_LEFT))
|
2009-07-30 10:33:27 +00:00
|
|
|
rect->xmin += 5;
|
2009-06-02 18:10:06 +00:00
|
|
|
|
|
|
|
/* always draw text for textbutton cursor */
|
|
|
|
widget_draw_text(fstyle, wcol, but, rect);
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* *********************** widget types ************************************* */
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2009-04-13 15:55:27 +00:00
|
|
|
/* uiWidgetStateColors
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
char inner_anim[4];
|
|
|
|
char inner_anim_sel[4];
|
|
|
|
char inner_key[4];
|
|
|
|
char inner_key_sel[4];
|
|
|
|
char inner_driven[4];
|
|
|
|
char inner_driven_sel[4];
|
2009-07-12 02:06:15 +00:00
|
|
|
float blend;
|
2009-04-13 15:55:27 +00:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct uiWidgetStateColors wcol_state= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{115, 190, 76, 255},
|
|
|
|
{90, 166, 51, 255},
|
|
|
|
{240, 235, 100, 255},
|
2009-07-12 02:06:15 +00:00
|
|
|
{215, 211, 75, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{180, 0, 255, 255},
|
2009-07-12 02:06:15 +00:00
|
|
|
{153, 0, 230, 255},
|
|
|
|
0.5f, 0.0f
|
2009-04-13 15:55:27 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* uiWidgetColors
|
|
|
|
float outline[3];
|
|
|
|
float inner[4];
|
|
|
|
float inner_sel[4];
|
2009-03-25 16:58:42 +00:00
|
|
|
float item[3];
|
2009-04-02 15:01:11 +00:00
|
|
|
float text[3];
|
|
|
|
float text_sel[3];
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
short shaded;
|
|
|
|
float shadetop, shadedown;
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct uiWidgetColors wcol_num= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{25, 25, 25, 255},
|
|
|
|
{180, 180, 180, 255},
|
|
|
|
{153, 153, 153, 255},
|
|
|
|
{90, 90, 90, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
1,
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
-20, 0
|
2009-03-25 16:58:42 +00:00
|
|
|
};
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
static struct uiWidgetColors wcol_numslider= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{25, 25, 25, 255},
|
|
|
|
{180, 180, 180, 255},
|
|
|
|
{153, 153, 153, 255},
|
|
|
|
{128, 128, 128, 255},
|
2009-04-02 18:16:15 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
2009-04-02 18:16:15 +00:00
|
|
|
|
|
|
|
1,
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
-20, 0
|
2009-04-02 18:16:15 +00:00
|
|
|
};
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
static struct uiWidgetColors wcol_text= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{25, 25, 25, 255},
|
|
|
|
{153, 153, 153, 255},
|
|
|
|
{153, 153, 153, 255},
|
|
|
|
{90, 90, 90, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
1,
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
0, 25
|
2009-03-25 16:58:42 +00:00
|
|
|
};
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
static struct uiWidgetColors wcol_option= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
2009-04-29 04:43:17 +00:00
|
|
|
{70, 70, 70, 255},
|
|
|
|
{70, 70, 70, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{255, 255, 255, 255},
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
1,
|
2009-05-18 18:20:29 +00:00
|
|
|
15, -15
|
2009-04-02 15:01:11 +00:00
|
|
|
};
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* button that shows popup */
|
2009-03-25 16:58:42 +00:00
|
|
|
static struct uiWidgetColors wcol_menu= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
2009-04-29 04:43:17 +00:00
|
|
|
{70, 70, 70, 255},
|
|
|
|
{70, 70, 70, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{255, 255, 255, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{255, 255, 255, 255},
|
|
|
|
{204, 204, 204, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
1,
|
2009-05-18 18:20:29 +00:00
|
|
|
15, -15
|
2009-03-25 16:58:42 +00:00
|
|
|
};
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* button that starts pulldown */
|
|
|
|
static struct uiWidgetColors wcol_pulldown= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{63, 63, 63, 255},
|
2009-04-29 04:43:17 +00:00
|
|
|
{86, 128, 194, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{255, 255, 255, 255},
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2009-04-29 04:43:17 +00:00
|
|
|
{0, 0, 0, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
0,
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
25, -20
|
2009-04-03 16:26:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* button inside menu */
|
|
|
|
static struct uiWidgetColors wcol_menu_item= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
2009-04-29 04:43:17 +00:00
|
|
|
{0, 0, 0, 0},
|
|
|
|
{86, 128, 194, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{255, 255, 255, 255},
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{255, 255, 255, 255},
|
|
|
|
{0, 0, 0, 255},
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
0,
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
38, 0
|
2009-04-03 16:26:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* backdrop menu + title text color */
|
|
|
|
static struct uiWidgetColors wcol_menu_back= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
2009-04-29 04:43:17 +00:00
|
|
|
{25, 25, 25, 230},
|
2009-06-10 11:43:21 +00:00
|
|
|
{45, 45, 45, 230},
|
2009-06-27 16:35:42 +00:00
|
|
|
{100, 100, 100, 255},
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2009-07-24 13:25:39 +00:00
|
|
|
{160, 160, 160, 255},
|
2009-06-10 11:43:21 +00:00
|
|
|
{255, 255, 255, 255},
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
0,
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
25, -20
|
2009-04-03 16:26:03 +00:00
|
|
|
};
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
static struct uiWidgetColors wcol_radio= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
2009-04-29 04:43:17 +00:00
|
|
|
{70, 70, 70, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{86, 128, 194, 255},
|
|
|
|
{255, 255, 255, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{255, 255, 255, 255},
|
|
|
|
{0, 0, 0, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
1,
|
2009-05-16 17:30:13 +00:00
|
|
|
15, -15
|
2009-03-25 16:58:42 +00:00
|
|
|
};
|
|
|
|
|
2009-11-19 09:57:04 +00:00
|
|
|
static struct uiWidgetColors wcol_regular= {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{25, 25, 25, 255},
|
2009-11-18 18:01:54 +00:00
|
|
|
{153, 153, 153, 255},
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{100, 100, 100, 255},
|
|
|
|
{25, 25, 25, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
0,
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
0, 0
|
2009-03-25 16:58:42 +00:00
|
|
|
};
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
static struct uiWidgetColors wcol_tool= {
|
|
|
|
{25, 25, 25, 255},
|
|
|
|
{153, 153, 153, 255},
|
|
|
|
{100, 100, 100, 255},
|
|
|
|
{25, 25, 25, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
1,
|
2009-08-23 21:56:32 +00:00
|
|
|
15, -15
|
2009-03-25 16:58:42 +00:00
|
|
|
};
|
|
|
|
|
2009-06-01 11:31:06 +00:00
|
|
|
static struct uiWidgetColors wcol_box= {
|
|
|
|
{25, 25, 25, 255},
|
|
|
|
{128, 128, 128, 255},
|
|
|
|
{100, 100, 100, 255},
|
|
|
|
{25, 25, 25, 255},
|
|
|
|
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
|
|
|
|
|
|
|
0,
|
|
|
|
0, 0
|
|
|
|
};
|
|
|
|
|
2009-06-24 14:16:56 +00:00
|
|
|
static struct uiWidgetColors wcol_toggle= {
|
|
|
|
{25, 25, 25, 255},
|
|
|
|
{153, 153, 153, 255},
|
|
|
|
{100, 100, 100, 255},
|
|
|
|
{25, 25, 25, 255},
|
|
|
|
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
|
|
|
|
|
|
|
0,
|
|
|
|
0, 0
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct uiWidgetColors wcol_scroll= {
|
2009-07-02 18:12:46 +00:00
|
|
|
{50, 50, 50, 180},
|
|
|
|
{80, 80, 80, 180},
|
|
|
|
{100, 100, 100, 180},
|
2009-07-23 20:50:24 +00:00
|
|
|
{128, 128, 128, 255},
|
2009-06-24 14:16:56 +00:00
|
|
|
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
|
|
|
|
|
|
|
1,
|
2009-07-23 20:50:24 +00:00
|
|
|
5, -5
|
2009-06-24 14:16:56 +00:00
|
|
|
};
|
|
|
|
|
2009-07-21 01:26:17 +00:00
|
|
|
static struct uiWidgetColors wcol_list_item= {
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{0, 0, 0, 0},
|
|
|
|
{86, 128, 194, 255},
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
|
|
|
|
0,
|
|
|
|
0, 0
|
|
|
|
};
|
|
|
|
|
2009-06-12 14:22:27 +00:00
|
|
|
/* free wcol struct to play with */
|
|
|
|
static struct uiWidgetColors wcol_tmp= {
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{128, 128, 128, 255},
|
|
|
|
{100, 100, 100, 255},
|
|
|
|
{25, 25, 25, 255},
|
|
|
|
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
|
|
|
|
|
|
|
0,
|
|
|
|
0, 0
|
|
|
|
};
|
|
|
|
|
2009-06-01 11:31:06 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
/* called for theme init (new theme) and versions */
|
|
|
|
void ui_widget_color_init(ThemeUI *tui)
|
|
|
|
{
|
2009-11-19 09:57:04 +00:00
|
|
|
tui->wcol_regular= wcol_regular;
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
tui->wcol_tool= wcol_tool;
|
|
|
|
tui->wcol_text= wcol_text;
|
2009-06-24 14:16:56 +00:00
|
|
|
tui->wcol_radio= wcol_radio;
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
tui->wcol_option= wcol_option;
|
2009-06-24 14:16:56 +00:00
|
|
|
tui->wcol_toggle= wcol_toggle;
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
tui->wcol_num= wcol_num;
|
|
|
|
tui->wcol_numslider= wcol_numslider;
|
|
|
|
tui->wcol_menu= wcol_menu;
|
|
|
|
tui->wcol_pulldown= wcol_pulldown;
|
|
|
|
tui->wcol_menu_back= wcol_menu_back;
|
|
|
|
tui->wcol_menu_item= wcol_menu_item;
|
2009-06-01 11:31:06 +00:00
|
|
|
tui->wcol_box= wcol_box;
|
2009-06-24 14:16:56 +00:00
|
|
|
tui->wcol_scroll= wcol_scroll;
|
2009-07-21 01:26:17 +00:00
|
|
|
tui->wcol_list_item= wcol_list_item;
|
2009-07-12 02:06:15 +00:00
|
|
|
|
|
|
|
tui->wcol_state= wcol_state;
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* ************ button callbacks, state ***************** */
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-07-12 02:06:15 +00:00
|
|
|
static void widget_state_blend(char *cp, char *cpstate, float fac)
|
|
|
|
{
|
|
|
|
if(fac != 0.0f) {
|
|
|
|
cp[0]= (int)((1.0f-fac)*cp[0] + fac*cpstate[0]);
|
|
|
|
cp[1]= (int)((1.0f-fac)*cp[1] + fac*cpstate[1]);
|
|
|
|
cp[2]= (int)((1.0f-fac)*cp[2] + fac*cpstate[2]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* copy colors from theme, and set changes in it based on state */
|
|
|
|
static void widget_state(uiWidgetType *wt, int state)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-07-12 02:06:15 +00:00
|
|
|
uiWidgetStateColors *wcol_state= wt->wcol_state;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
wt->wcol= *(wt->wcol_theme);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
if(state & UI_SELECT) {
|
2009-07-12 02:06:15 +00:00
|
|
|
QUATCOPY(wt->wcol.inner, wt->wcol.inner_sel)
|
|
|
|
|
2009-04-03 23:30:32 +00:00
|
|
|
if(state & UI_BUT_ANIMATED_KEY)
|
2009-07-12 02:06:15 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, wcol_state->inner_key_sel, wcol_state->blend);
|
2009-04-03 23:30:32 +00:00
|
|
|
else if(state & UI_BUT_ANIMATED)
|
2009-07-12 02:06:15 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, wcol_state->inner_anim_sel, wcol_state->blend);
|
2009-04-10 13:16:50 +00:00
|
|
|
else if(state & UI_BUT_DRIVEN)
|
2009-07-12 02:06:15 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, wcol_state->inner_driven_sel, wcol_state->blend);
|
2009-04-03 23:30:32 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
VECCOPY(wt->wcol.text, wt->wcol.text_sel);
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
/* only flip shade if it's not "pushed in" already */
|
2009-04-02 15:01:11 +00:00
|
|
|
if(wt->wcol.shaded && wt->wcol.shadetop>wt->wcol.shadedown) {
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
|
2009-04-02 15:01:11 +00:00
|
|
|
}
|
|
|
|
}
|
2009-04-03 23:30:32 +00:00
|
|
|
else {
|
|
|
|
if(state & UI_BUT_ANIMATED_KEY)
|
2009-07-12 02:06:15 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, wcol_state->inner_key, wcol_state->blend);
|
2009-04-03 23:30:32 +00:00
|
|
|
else if(state & UI_BUT_ANIMATED)
|
2009-07-12 02:06:15 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, wcol_state->inner_anim, wcol_state->blend);
|
2009-04-10 13:16:50 +00:00
|
|
|
else if(state & UI_BUT_DRIVEN)
|
2009-07-12 02:06:15 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, wcol_state->inner_driven, wcol_state->blend);
|
2009-04-03 23:30:32 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
if(state & UI_ACTIVE) { /* mouse over? */
|
|
|
|
wt->wcol.inner[0]= wt->wcol.inner[0]>=240? 255 : wt->wcol.inner[0]+15;
|
|
|
|
wt->wcol.inner[1]= wt->wcol.inner[1]>=240? 255 : wt->wcol.inner[1]+15;
|
|
|
|
wt->wcol.inner[2]= wt->wcol.inner[2]>=240? 255 : wt->wcol.inner[2]+15;
|
|
|
|
}
|
2009-04-03 23:30:32 +00:00
|
|
|
}
|
2009-04-02 15:01:11 +00:00
|
|
|
}
|
|
|
|
|
2009-10-15 11:52:23 +00:00
|
|
|
/* sliders use special hack which sets 'item' as inner when drawing filling */
|
|
|
|
static void widget_state_numslider(uiWidgetType *wt, int state)
|
|
|
|
{
|
|
|
|
uiWidgetStateColors *wcol_state= wt->wcol_state;
|
|
|
|
float blend= wcol_state->blend - 0.2f; // XXX special tweak to make sure that bar will still be visible
|
|
|
|
|
|
|
|
/* call this for option button */
|
|
|
|
widget_state(wt, state);
|
|
|
|
|
|
|
|
/* now, set the inner-part so that it reflects state settings too */
|
|
|
|
// TODO: maybe we should have separate settings for the blending colors used for this case?
|
|
|
|
if(state & UI_SELECT) {
|
|
|
|
if(state & UI_BUT_ANIMATED_KEY)
|
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_key_sel, blend);
|
|
|
|
else if(state & UI_BUT_ANIMATED)
|
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_anim_sel, blend);
|
|
|
|
else if(state & UI_BUT_DRIVEN)
|
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_driven_sel, blend);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if(state & UI_BUT_ANIMATED_KEY)
|
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_key, blend);
|
|
|
|
else if(state & UI_BUT_ANIMATED)
|
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_anim, blend);
|
|
|
|
else if(state & UI_BUT_DRIVEN)
|
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_driven, blend);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
/* labels use theme colors for text */
|
|
|
|
static void widget_state_label(uiWidgetType *wt, int state)
|
|
|
|
{
|
|
|
|
/* call this for option button */
|
|
|
|
widget_state(wt, state);
|
|
|
|
|
|
|
|
if(state & UI_SELECT)
|
|
|
|
UI_GetThemeColor4ubv(TH_TEXT_HI, wt->wcol.text);
|
|
|
|
else
|
|
|
|
UI_GetThemeColor4ubv(TH_TEXT, wt->wcol.text);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
static void widget_state_nothing(uiWidgetType *wt, int state)
|
|
|
|
{
|
|
|
|
wt->wcol= *(wt->wcol_theme);
|
|
|
|
}
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* special case, button that calls pulldown */
|
|
|
|
static void widget_state_pulldown(uiWidgetType *wt, int state)
|
|
|
|
{
|
|
|
|
wt->wcol= *(wt->wcol_theme);
|
|
|
|
|
|
|
|
QUATCOPY(wt->wcol.inner, wt->wcol.inner_sel);
|
|
|
|
VECCOPY(wt->wcol.outline, wt->wcol.inner);
|
|
|
|
|
|
|
|
if(state & UI_ACTIVE)
|
|
|
|
VECCOPY(wt->wcol.text, wt->wcol.text_sel);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* special case, menu items */
|
|
|
|
static void widget_state_menu_item(uiWidgetType *wt, int state)
|
|
|
|
{
|
|
|
|
wt->wcol= *(wt->wcol_theme);
|
|
|
|
|
2009-05-28 23:37:55 +00:00
|
|
|
if(state & (UI_BUT_DISABLED|UI_BUT_INACTIVE)) {
|
2009-04-12 13:40:29 +00:00
|
|
|
wt->wcol.text[0]= 0.5f*(wt->wcol.text[0]+wt->wcol.text_sel[0]);
|
|
|
|
wt->wcol.text[1]= 0.5f*(wt->wcol.text[1]+wt->wcol.text_sel[1]);
|
|
|
|
wt->wcol.text[2]= 0.5f*(wt->wcol.text[2]+wt->wcol.text_sel[2]);
|
|
|
|
}
|
|
|
|
else if(state & UI_ACTIVE) {
|
2009-04-03 16:26:03 +00:00
|
|
|
QUATCOPY(wt->wcol.inner, wt->wcol.inner_sel);
|
|
|
|
VECCOPY(wt->wcol.text, wt->wcol.text_sel);
|
|
|
|
|
|
|
|
wt->wcol.shaded= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* ************ menu backdrop ************************* */
|
|
|
|
|
|
|
|
/* outside of rect, rad to left/bottom/right */
|
|
|
|
static void widget_softshadow(rcti *rect, int roundboxalign, float radin, float radout)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
rcti rect1= *rect;
|
|
|
|
float alpha, alphastep;
|
|
|
|
int step, tot, a;
|
|
|
|
|
2009-04-15 14:43:54 +00:00
|
|
|
/* prevent tooltips to not show round shadow */
|
|
|
|
if( 2.0f*radout > 0.2f*(rect1.ymax-rect1.ymin) )
|
|
|
|
rect1.ymax -= 0.2f*(rect1.ymax-rect1.ymin);
|
|
|
|
else
|
|
|
|
rect1.ymax -= 2.0f*radout;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
/* inner part */
|
2009-04-15 14:43:54 +00:00
|
|
|
tot= round_box_shadow_edges(wtb.inner_v, &rect1, radin, roundboxalign & 12, 0.0f);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
/* inverse linear shadow alpha */
|
|
|
|
alpha= 0.15;
|
|
|
|
alphastep= 0.67;
|
|
|
|
|
|
|
|
for(step= 1; step<=radout; step++, alpha*=alphastep) {
|
2009-04-15 14:43:54 +00:00
|
|
|
round_box_shadow_edges(wtb.outer_v, &rect1, radin, 15, (float)step);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
glColor4f(0.0f, 0.0f, 0.0f, alpha);
|
|
|
|
|
|
|
|
glBegin(GL_QUAD_STRIP);
|
|
|
|
for(a=0; a<tot; a++) {
|
|
|
|
glVertex2fv(wtb.outer_v[a]);
|
|
|
|
glVertex2fv(wtb.inner_v[a]);
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int direction)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
int roundboxalign= 15;
|
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* menu is 2nd level or deeper */
|
|
|
|
if (flag & UI_BLOCK_POPUP) {
|
2009-06-04 18:38:10 +00:00
|
|
|
//rect->ymin -= 4.0;
|
|
|
|
//rect->ymax += 4.0;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
else if (direction == UI_DOWN) {
|
|
|
|
roundboxalign= 12;
|
|
|
|
rect->ymin -= 4.0;
|
|
|
|
}
|
|
|
|
else if (direction == UI_TOP) {
|
|
|
|
roundboxalign= 3;
|
|
|
|
rect->ymax += 4.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
widget_softshadow(rect, roundboxalign, 5.0f, 8.0f);
|
|
|
|
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 5.0f);
|
|
|
|
wtb.emboss= 0;
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-12 14:22:27 +00:00
|
|
|
static void ui_hsv_cursor(float x, float y)
|
|
|
|
{
|
|
|
|
|
|
|
|
glPushMatrix();
|
|
|
|
glTranslatef(x, y, 0.0f);
|
|
|
|
|
|
|
|
glColor3f(1.0f, 1.0f, 1.0f);
|
|
|
|
glutil_draw_filled_arc(0.0f, M_PI*2.0, 3.0f, 8);
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glEnable(GL_LINE_SMOOTH );
|
|
|
|
glColor3f(0.0f, 0.0f, 0.0f);
|
|
|
|
glutil_draw_lined_arc(0.0f, M_PI*2.0, 3.0f, 12);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
glDisable(GL_LINE_SMOOTH );
|
|
|
|
|
|
|
|
glPopMatrix();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void ui_hsvcircle_vals_from_pos(float *valrad, float *valdist, rcti *rect, float mx, float my)
|
2009-06-10 11:43:21 +00:00
|
|
|
{
|
|
|
|
/* duplication of code... well, simple is better now */
|
|
|
|
float centx= (float)(rect->xmin + rect->xmax)/2;
|
|
|
|
float centy= (float)(rect->ymin + rect->ymax)/2;
|
|
|
|
float radius, dist;
|
|
|
|
|
|
|
|
if( rect->xmax-rect->xmin > rect->ymax-rect->ymin )
|
|
|
|
radius= (float)(rect->ymax - rect->ymin)/2;
|
|
|
|
else
|
|
|
|
radius= (float)(rect->xmax - rect->xmin)/2;
|
|
|
|
|
|
|
|
mx-= centx;
|
|
|
|
my-= centy;
|
|
|
|
dist= sqrt( mx*mx + my*my);
|
|
|
|
if(dist < radius)
|
|
|
|
*valdist= dist/radius;
|
|
|
|
else
|
|
|
|
*valdist= 1.0f;
|
|
|
|
|
|
|
|
*valrad= atan2(mx, my)/(2.0f*M_PI) + 0.5f;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ui_draw_but_HSVCIRCLE(uiBut *but, rcti *rect)
|
|
|
|
{
|
|
|
|
/* gouraud triangle fan */
|
|
|
|
float radstep, ang= 0.0f;
|
|
|
|
float centx, centy, radius;
|
|
|
|
float hsv[3], col[3], colcent[3];
|
|
|
|
int a, tot= 32;
|
|
|
|
|
|
|
|
radstep= 2.0f*M_PI/(float)tot;
|
|
|
|
centx= (float)(rect->xmin + rect->xmax)/2;
|
|
|
|
centy= (float)(rect->ymin + rect->ymax)/2;
|
|
|
|
|
|
|
|
if( rect->xmax-rect->xmin > rect->ymax-rect->ymin )
|
|
|
|
radius= (float)(rect->ymax - rect->ymin)/2;
|
|
|
|
else
|
|
|
|
radius= (float)(rect->xmax - rect->xmin)/2;
|
|
|
|
|
|
|
|
/* color */
|
|
|
|
VECCOPY(hsv, but->hsv);
|
|
|
|
hsv[0]= hsv[1]= 0.0f;
|
|
|
|
hsv_to_rgb(hsv[0], hsv[1], hsv[2], colcent, colcent+1, colcent+2);
|
|
|
|
|
|
|
|
glShadeModel(GL_SMOOTH);
|
|
|
|
|
|
|
|
glBegin(GL_TRIANGLE_FAN);
|
|
|
|
glColor3fv(colcent);
|
|
|
|
glVertex2f( centx, centy);
|
|
|
|
|
|
|
|
for(a=0; a<=tot; a++, ang+=radstep) {
|
|
|
|
float si= sin(ang);
|
|
|
|
float co= cos(ang);
|
|
|
|
|
2009-06-12 14:22:27 +00:00
|
|
|
ui_hsvcircle_vals_from_pos(hsv, hsv+1, rect, centx + co*radius, centy + si*radius);
|
2009-06-10 11:43:21 +00:00
|
|
|
hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col+1, col+2);
|
|
|
|
glColor3fv(col);
|
|
|
|
glVertex2f( centx + co*radius, centy + si*radius);
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
glShadeModel(GL_FLAT);
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
/* fully rounded outline */
|
|
|
|
glPushMatrix();
|
|
|
|
glTranslatef(centx, centy, 0.0f);
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glEnable(GL_LINE_SMOOTH );
|
|
|
|
glColor3f(0.0f, 0.0f, 0.0f);
|
|
|
|
glutil_draw_lined_arc(0.0f, M_PI*2.0, radius, tot);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
glDisable(GL_LINE_SMOOTH );
|
|
|
|
glPopMatrix();
|
|
|
|
|
|
|
|
/* cursor */
|
|
|
|
ang= 2.0f*M_PI*but->hsv[0] + 0.5f*M_PI;
|
|
|
|
radius= but->hsv[1]*radius;
|
|
|
|
ui_hsv_cursor(centx + cos(-ang)*radius, centy + sin(-ang)*radius);
|
|
|
|
|
2009-06-10 11:43:21 +00:00
|
|
|
}
|
|
|
|
|
2009-06-12 14:22:27 +00:00
|
|
|
/* ************ custom buttons, old stuff ************** */
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* draws in resolution of 20x4 colors */
|
2009-04-12 13:40:29 +00:00
|
|
|
static void ui_draw_but_HSVCUBE(uiBut *but, rcti *rect)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
|
|
|
int a;
|
|
|
|
float h,s,v;
|
2009-07-16 04:45:52 +00:00
|
|
|
float dx, dy, sx1, sx2, sy, x=0.0f, y=0.0f;
|
2009-04-03 16:26:03 +00:00
|
|
|
float col0[4][3]; // left half, rect bottom to top
|
|
|
|
float col1[4][3]; // right half, rect bottom to top
|
|
|
|
|
|
|
|
h= but->hsv[0];
|
|
|
|
s= but->hsv[1];
|
|
|
|
v= but->hsv[2];
|
|
|
|
|
|
|
|
/* draw series of gouraud rects */
|
|
|
|
glShadeModel(GL_SMOOTH);
|
|
|
|
|
|
|
|
if(but->a1==0) { // H and V vary
|
|
|
|
hsv_to_rgb(0.0, s, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(0.0, s, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(0.0, s, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(0.0, s, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
|
|
|
|
x= h; y= v;
|
|
|
|
}
|
|
|
|
else if(but->a1==1) { // H and S vary
|
|
|
|
hsv_to_rgb(0.0, 0.0, v, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(0.0, 0.333, v, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(0.0, 0.666, v, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(0.0, 1.0, v, &col1[3][0], &col1[3][1], &col1[3][2]);
|
|
|
|
x= h; y= s;
|
|
|
|
}
|
|
|
|
else if(but->a1==2) { // S and V vary
|
|
|
|
hsv_to_rgb(h, 0.0, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(h, 0.333, 0.0, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(h, 0.666, 0.0, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(h, 1.0, 0.0, &col1[3][0], &col1[3][1], &col1[3][2]);
|
|
|
|
x= v; y= s;
|
|
|
|
}
|
2009-06-12 14:22:27 +00:00
|
|
|
else if(but->a1==3) { // only hue slider
|
2009-04-03 16:26:03 +00:00
|
|
|
hsv_to_rgb(0.0, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
VECCOPY(col1[1], col1[0]);
|
|
|
|
VECCOPY(col1[2], col1[0]);
|
|
|
|
VECCOPY(col1[3], col1[0]);
|
|
|
|
x= h; y= 0.5;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(dx=0.0; dx<1.0; dx+= 0.05) {
|
|
|
|
// previous color
|
|
|
|
VECCOPY(col0[0], col1[0]);
|
|
|
|
VECCOPY(col0[1], col1[1]);
|
|
|
|
VECCOPY(col0[2], col1[2]);
|
|
|
|
VECCOPY(col0[3], col1[3]);
|
|
|
|
|
|
|
|
// new color
|
|
|
|
if(but->a1==0) { // H and V vary
|
|
|
|
hsv_to_rgb(dx, s, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(dx, s, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(dx, s, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(dx, s, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
|
|
|
|
}
|
|
|
|
else if(but->a1==1) { // H and S vary
|
|
|
|
hsv_to_rgb(dx, 0.0, v, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(dx, 0.333, v, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(dx, 0.666, v, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(dx, 1.0, v, &col1[3][0], &col1[3][1], &col1[3][2]);
|
|
|
|
}
|
|
|
|
else if(but->a1==2) { // S and V vary
|
|
|
|
hsv_to_rgb(h, 0.0, dx, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(h, 0.333, dx, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(h, 0.666, dx, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(h, 1.0, dx, &col1[3][0], &col1[3][1], &col1[3][2]);
|
|
|
|
}
|
2009-06-12 14:22:27 +00:00
|
|
|
else if(but->a1==3) { // only H
|
2009-04-03 16:26:03 +00:00
|
|
|
hsv_to_rgb(dx, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
VECCOPY(col1[1], col1[0]);
|
|
|
|
VECCOPY(col1[2], col1[0]);
|
|
|
|
VECCOPY(col1[3], col1[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// rect
|
2009-04-12 13:40:29 +00:00
|
|
|
sx1= rect->xmin + dx*(rect->xmax-rect->xmin);
|
|
|
|
sx2= rect->xmin + (dx+0.05)*(rect->xmax-rect->xmin);
|
|
|
|
sy= rect->ymin;
|
|
|
|
dy= (rect->ymax-rect->ymin)/3.0;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
glBegin(GL_QUADS);
|
|
|
|
for(a=0; a<3; a++, sy+=dy) {
|
|
|
|
glColor3fv(col0[a]);
|
|
|
|
glVertex2f(sx1, sy);
|
|
|
|
|
|
|
|
glColor3fv(col1[a]);
|
|
|
|
glVertex2f(sx2, sy);
|
|
|
|
|
|
|
|
glColor3fv(col1[a+1]);
|
|
|
|
glVertex2f(sx2, sy+dy);
|
|
|
|
|
|
|
|
glColor3fv(col0[a+1]);
|
|
|
|
glVertex2f(sx1, sy+dy);
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
|
|
|
glShadeModel(GL_FLAT);
|
|
|
|
|
|
|
|
/* cursor */
|
2009-04-12 13:40:29 +00:00
|
|
|
x= rect->xmin + x*(rect->xmax-rect->xmin);
|
|
|
|
y= rect->ymin + y*(rect->ymax-rect->ymin);
|
|
|
|
CLAMP(x, rect->xmin+3.0, rect->xmax-3.0);
|
|
|
|
CLAMP(y, rect->ymin+3.0, rect->ymax-3.0);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2009-06-12 14:22:27 +00:00
|
|
|
ui_hsv_cursor(x, y);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
/* outline */
|
|
|
|
glColor3ub(0, 0, 0);
|
2009-04-12 13:40:29 +00:00
|
|
|
fdrawbox((rect->xmin), (rect->ymin), (rect->xmax), (rect->ymax));
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
|
2009-06-12 14:22:27 +00:00
|
|
|
/* vertical 'value' slider, using new widget code */
|
|
|
|
static void ui_draw_but_HSV_v(uiBut *but, rcti *rect)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
float rad= 0.5f*(rect->xmax - rect->xmin);
|
|
|
|
float x, y;
|
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* fully rounded */
|
|
|
|
round_box_edges(&wtb, 15, rect, rad);
|
|
|
|
|
|
|
|
/* setup temp colors */
|
|
|
|
wcol_tmp.outline[0]= wcol_tmp.outline[1]= wcol_tmp.outline[2]= 0;
|
|
|
|
wcol_tmp.inner[0]= wcol_tmp.inner[1]= wcol_tmp.inner[2]= 128;
|
|
|
|
wcol_tmp.shadetop= 127;
|
|
|
|
wcol_tmp.shadedown= -128;
|
|
|
|
wcol_tmp.shaded= 1;
|
|
|
|
|
|
|
|
widgetbase_draw(&wtb, &wcol_tmp);
|
|
|
|
|
|
|
|
/* cursor */
|
|
|
|
x= rect->xmin + 0.5f*(rect->xmax-rect->xmin);
|
|
|
|
y= rect->ymin + but->hsv[2]*(rect->ymax-rect->ymin);
|
|
|
|
CLAMP(y, rect->ymin+3.0, rect->ymax-3.0);
|
|
|
|
|
|
|
|
ui_hsv_cursor(x, y);
|
|
|
|
|
|
|
|
}
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
/* ************ button callbacks, draw ***************** */
|
|
|
|
|
|
|
|
static void widget_numbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
2009-06-08 12:39:39 +00:00
|
|
|
float rad= 0.5f*(rect->ymax - rect->ymin);
|
2009-11-12 00:48:44 +00:00
|
|
|
float textofs = rad*0.75;
|
2009-11-11 10:27:25 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* fully rounded */
|
2009-06-08 12:39:39 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* decoration */
|
2009-04-02 15:01:11 +00:00
|
|
|
if(!(state & UI_TEXTINPUT)) {
|
2009-07-03 13:21:09 +00:00
|
|
|
widget_num_tria(&wtb.tria1, rect, 0.6f, 'l');
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_num_tria(&wtb.tria2, rect, 0.6f, 'r');
|
2009-11-12 00:48:44 +00:00
|
|
|
}
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-04-09 18:11:18 +00:00
|
|
|
|
|
|
|
/* text space */
|
2009-11-12 00:48:44 +00:00
|
|
|
rect->xmin += textofs;
|
|
|
|
rect->xmax -= textofs;
|
2009-04-02 18:16:15 +00:00
|
|
|
}
|
|
|
|
|
2009-06-17 11:01:05 +00:00
|
|
|
|
|
|
|
static int ui_link_bezier_points(rcti *rect, float coord_array[][2], int resol)
|
|
|
|
{
|
|
|
|
float dist, vec[4][2];
|
|
|
|
|
|
|
|
vec[0][0]= rect->xmin;
|
|
|
|
vec[0][1]= rect->ymin;
|
|
|
|
vec[3][0]= rect->xmax;
|
|
|
|
vec[3][1]= rect->ymax;
|
|
|
|
|
|
|
|
dist= 0.5f*ABS(vec[0][0] - vec[3][0]);
|
|
|
|
|
|
|
|
vec[1][0]= vec[0][0]+dist;
|
|
|
|
vec[1][1]= vec[0][1];
|
|
|
|
|
|
|
|
vec[2][0]= vec[3][0]-dist;
|
|
|
|
vec[2][1]= vec[3][1];
|
|
|
|
|
2009-09-11 14:56:54 +00:00
|
|
|
forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float)*2);
|
|
|
|
forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, sizeof(float)*2);
|
2009-06-17 11:01:05 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define LINK_RESOL 24
|
|
|
|
void ui_draw_link_bezier(rcti *rect)
|
|
|
|
{
|
|
|
|
float coord_array[LINK_RESOL+1][2];
|
|
|
|
|
|
|
|
if(ui_link_bezier_points(rect, coord_array, LINK_RESOL)) {
|
|
|
|
float dist;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* we can reuse the dist variable here to increment the GL curve eval amount*/
|
|
|
|
dist = 1.0f/(float)LINK_RESOL;
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
for(i=0; i<=LINK_RESOL; i++) {
|
|
|
|
glVertex2fv(coord_array[i]);
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
/* function in use for buttons and for view2d sliders */
|
2009-07-03 10:54:39 +00:00
|
|
|
void uiWidgetScrollDraw(uiWidgetColors *wcol, rcti *rect, rcti *slider, int state)
|
2009-06-24 14:16:56 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
2009-07-02 18:12:46 +00:00
|
|
|
float rad;
|
2009-06-24 14:16:56 +00:00
|
|
|
int horizontal;
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
widget_init(&wtb);
|
|
|
|
|
2009-06-24 14:16:56 +00:00
|
|
|
/* determine horizontal/vertical */
|
|
|
|
horizontal= (rect->xmax - rect->xmin > rect->ymax - rect->ymin);
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2009-06-24 14:16:56 +00:00
|
|
|
if(horizontal)
|
|
|
|
rad= 0.5f*(rect->ymax - rect->ymin);
|
|
|
|
else
|
|
|
|
rad= 0.5f*(rect->xmax - rect->xmin);
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2009-06-24 14:16:56 +00:00
|
|
|
wtb.shadedir= (horizontal)? 1: 0;
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2009-06-24 14:16:56 +00:00
|
|
|
/* draw back part, colors swapped and shading inverted */
|
|
|
|
if(horizontal)
|
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
round_box_edges(&wtb, 15, rect, rad);
|
2009-06-24 14:16:56 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
/* slider */
|
|
|
|
if(slider->xmax-slider->xmin<2 || slider->ymax-slider->ymin<2);
|
|
|
|
else {
|
|
|
|
|
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
|
|
|
QUATCOPY(wcol->inner, wcol->item);
|
|
|
|
|
|
|
|
if(wcol->shadetop>wcol->shadedown)
|
|
|
|
wcol->shadetop+= 20; /* XXX violates themes... */
|
|
|
|
else wcol->shadedown+= 20;
|
|
|
|
|
2009-07-23 20:50:24 +00:00
|
|
|
if(state & UI_SCROLL_PRESSED) {
|
|
|
|
wcol->inner[0]= wcol->inner[0]>=250? 255 : wcol->inner[0]+5;
|
|
|
|
wcol->inner[1]= wcol->inner[1]>=250? 255 : wcol->inner[1]+5;
|
|
|
|
wcol->inner[2]= wcol->inner[2]>=250? 255 : wcol->inner[2]+5;
|
|
|
|
}
|
2009-07-02 18:12:46 +00:00
|
|
|
|
|
|
|
/* draw */
|
|
|
|
wtb.emboss= 0; /* only emboss once */
|
|
|
|
|
|
|
|
round_box_edges(&wtb, 15, slider, rad);
|
|
|
|
|
2009-07-03 13:21:09 +00:00
|
|
|
if(state & UI_SCROLL_ARROWS) {
|
|
|
|
if(wcol->item[0] > 48) wcol->item[0]-= 48;
|
|
|
|
if(wcol->item[1] > 48) wcol->item[1]-= 48;
|
|
|
|
if(wcol->item[2] > 48) wcol->item[2]-= 48;
|
|
|
|
wcol->item[3]= 255;
|
|
|
|
|
|
|
|
if(horizontal) {
|
2009-09-14 12:28:59 +00:00
|
|
|
widget_scroll_circle(&wtb.tria1, slider, 0.6f, 'l');
|
|
|
|
widget_scroll_circle(&wtb.tria2, slider, 0.6f, 'r');
|
2009-07-03 13:21:09 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-09-14 12:28:59 +00:00
|
|
|
widget_scroll_circle(&wtb.tria1, slider, 0.6f, 'b');
|
|
|
|
widget_scroll_circle(&wtb.tria2, slider, 0.6f, 't');
|
2009-07-03 13:21:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-07-02 18:12:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void widget_scroll(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
rcti rect1;
|
|
|
|
double value;
|
2009-07-21 01:26:17 +00:00
|
|
|
float fac, size, min;
|
2009-07-02 18:12:46 +00:00
|
|
|
int horizontal;
|
|
|
|
|
|
|
|
/* calculate slider part */
|
2009-06-24 14:16:56 +00:00
|
|
|
value= ui_get_but_val(but);
|
|
|
|
|
|
|
|
size= (but->softmax + but->a1 - but->softmin);
|
|
|
|
size= MAX2(size, 2);
|
|
|
|
|
|
|
|
/* position */
|
|
|
|
rect1= *rect;
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
/* determine horizontal/vertical */
|
|
|
|
horizontal= (rect->xmax - rect->xmin > rect->ymax - rect->ymin);
|
|
|
|
|
2009-06-24 14:16:56 +00:00
|
|
|
if(horizontal) {
|
2009-07-01 22:25:49 +00:00
|
|
|
fac= (rect->xmax - rect->xmin)/(size);
|
2009-06-24 14:16:56 +00:00
|
|
|
rect1.xmin= rect1.xmin + ceil(fac*(value - but->softmin));
|
|
|
|
rect1.xmax= rect1.xmin + ceil(fac*(but->a1 - but->softmin));
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
/* ensure minimium size */
|
|
|
|
min= rect->ymax - rect->ymin;
|
|
|
|
|
|
|
|
if(rect1.xmax - rect1.xmin < min) {
|
|
|
|
rect1.xmax= rect1.xmin + min;
|
|
|
|
|
|
|
|
if(rect1.xmax > rect->xmax) {
|
|
|
|
rect1.xmax= rect->xmax;
|
|
|
|
rect1.xmin= MAX2(rect1.xmax - min, rect->xmin);
|
|
|
|
}
|
|
|
|
}
|
2009-06-24 14:16:56 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-07-01 22:25:49 +00:00
|
|
|
fac= (rect->ymax - rect->ymin)/(size);
|
2009-06-24 14:16:56 +00:00
|
|
|
rect1.ymax= rect1.ymax - ceil(fac*(value - but->softmin));
|
|
|
|
rect1.ymin= rect1.ymax - ceil(fac*(but->a1 - but->softmin));
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
/* ensure minimium size */
|
|
|
|
min= rect->xmax - rect->xmin;
|
|
|
|
|
|
|
|
if(rect1.ymax - rect1.ymin < min) {
|
|
|
|
rect1.ymax= rect1.ymin + min;
|
|
|
|
|
|
|
|
if(rect1.ymax > rect->ymax) {
|
|
|
|
rect1.ymax= rect->ymax;
|
|
|
|
rect1.ymin= MAX2(rect1.ymax - min, rect->ymin);
|
|
|
|
}
|
|
|
|
}
|
2009-06-24 14:16:56 +00:00
|
|
|
}
|
|
|
|
|
2009-07-03 13:21:09 +00:00
|
|
|
if(state & UI_SELECT)
|
|
|
|
state= UI_SCROLL_PRESSED;
|
|
|
|
else
|
|
|
|
state= 0;
|
2009-07-03 10:54:39 +00:00
|
|
|
uiWidgetScrollDraw(wcol, rect, &rect1, state);
|
2009-06-24 14:16:56 +00:00
|
|
|
}
|
2009-06-17 11:01:05 +00:00
|
|
|
|
|
|
|
static void widget_link(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
|
|
|
|
if(but->flag & UI_SELECT) {
|
|
|
|
rcti rectlink;
|
|
|
|
|
|
|
|
UI_ThemeColor(TH_TEXT_HI);
|
|
|
|
|
|
|
|
rectlink.xmin= (rect->xmin+rect->xmax)/2;
|
|
|
|
rectlink.ymin= (rect->ymin+rect->ymax)/2;
|
|
|
|
rectlink.xmax= but->linkto[0];
|
|
|
|
rectlink.ymax= but->linkto[1];
|
|
|
|
|
|
|
|
ui_draw_link_bezier(&rectlink);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb, wtb1;
|
|
|
|
rcti rect1;
|
|
|
|
double value;
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
float offs, fac;
|
|
|
|
char outline[3];
|
2009-04-02 18:16:15 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
widget_init(&wtb1);
|
|
|
|
|
|
|
|
/* backdrop first */
|
|
|
|
|
|
|
|
/* fully rounded */
|
|
|
|
offs= 0.5f*(rect->ymax - rect->ymin);
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, offs);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
wtb.outline= 0;
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
|
|
|
/* slider part */
|
2009-05-22 09:09:07 +00:00
|
|
|
VECCOPY(outline, wcol->outline);
|
|
|
|
VECCOPY(wcol->outline, wcol->item);
|
|
|
|
VECCOPY(wcol->inner, wcol->item);
|
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
rect1= *rect;
|
|
|
|
|
|
|
|
value= ui_get_but_val(but);
|
2009-05-20 13:56:22 +00:00
|
|
|
fac= (value-but->softmin)*(rect1.xmax - rect1.xmin - offs)/(but->softmax - but->softmin);
|
2009-04-02 18:16:15 +00:00
|
|
|
|
2009-05-22 09:09:07 +00:00
|
|
|
/* left part of slider, always rounded */
|
|
|
|
rect1.xmax= rect1.xmin + ceil(offs+1.0f);
|
|
|
|
round_box_edges(&wtb1, roundboxalign & ~6, &rect1, offs);
|
|
|
|
wtb1.outline= 0;
|
|
|
|
widgetbase_draw(&wtb1, wcol);
|
|
|
|
|
|
|
|
/* right part of slider, interpolate roundness */
|
2009-05-20 13:56:22 +00:00
|
|
|
rect1.xmax= rect1.xmin + fac + offs;
|
2009-05-22 09:09:07 +00:00
|
|
|
rect1.xmin+= floor(offs-1.0f);
|
2009-05-21 17:09:06 +00:00
|
|
|
if(rect1.xmax + offs > rect->xmax)
|
|
|
|
offs*= (rect1.xmax + offs - rect->xmax)/offs;
|
|
|
|
else
|
|
|
|
offs= 0.0f;
|
2009-05-22 09:09:07 +00:00
|
|
|
round_box_edges(&wtb1, roundboxalign & ~9, &rect1, offs);
|
2009-04-02 18:16:15 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb1, wcol);
|
2009-04-12 13:40:29 +00:00
|
|
|
VECCOPY(wcol->outline, outline);
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
2009-04-02 18:16:15 +00:00
|
|
|
|
|
|
|
/* outline */
|
|
|
|
wtb.outline= 1;
|
|
|
|
wtb.inner= 0;
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
/* text space */
|
2009-11-11 10:27:25 +00:00
|
|
|
rect->xmin += offs*0.75f;
|
|
|
|
rect->xmax -= offs*0.75f;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
float col[4];
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* half rounded */
|
2009-08-23 21:56:32 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 5.0f);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
ui_get_but_vectorf(but, col);
|
|
|
|
wcol->inner[0]= FTOCHAR(col[0]);
|
|
|
|
wcol->inner[1]= FTOCHAR(col[1]);
|
|
|
|
wcol->inner[2]= FTOCHAR(col[2]);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
static void widget_textbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* half rounded */
|
2009-08-23 21:56:32 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 4.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
static void widget_menubut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* half rounded */
|
2009-04-02 15:01:11 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 4.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* decoration */
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_menu_trias(&wtb.tria1, rect);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-04-09 18:11:18 +00:00
|
|
|
|
|
|
|
/* text space */
|
|
|
|
rect->xmax -= (rect->ymax-rect->ymin);
|
2009-09-28 15:59:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void widget_menuiconbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* half rounded */
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 4.0f);
|
2009-04-09 18:11:18 +00:00
|
|
|
|
2009-09-28 15:59:09 +00:00
|
|
|
/* decoration */
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
if(state & UI_ACTIVE) {
|
|
|
|
uiWidgetBase wtb;
|
2009-08-26 00:38:43 +00:00
|
|
|
float rad= 0.5f*(rect->ymax - rect->ymin); // 4.0f
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
2009-08-23 21:56:32 +00:00
|
|
|
/* half rounded */
|
2009-08-26 00:38:43 +00:00
|
|
|
round_box_edges(&wtb, 15, rect, rad);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void widget_menu_itembut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* not rounded, no outline */
|
|
|
|
wtb.outline= 0;
|
|
|
|
round_box_edges(&wtb, 0, rect, 0.0f);
|
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
}
|
|
|
|
|
2009-07-21 01:26:17 +00:00
|
|
|
static void widget_list_itembut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* rounded, but no outline */
|
|
|
|
wtb.outline= 0;
|
|
|
|
round_box_edges(&wtb, 15, rect, 4.0f);
|
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
static void widget_optionbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2009-03-25 16:58:42 +00:00
|
|
|
rcti recttemp= *rect;
|
|
|
|
int delta;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* square */
|
|
|
|
recttemp.xmax= recttemp.xmin + (recttemp.ymax-recttemp.ymin);
|
|
|
|
|
|
|
|
/* smaller */
|
|
|
|
delta= 1 + (recttemp.ymax-recttemp.ymin)/8;
|
|
|
|
recttemp.xmin+= delta;
|
|
|
|
recttemp.ymin+= delta;
|
|
|
|
recttemp.xmax-= delta;
|
|
|
|
recttemp.ymax-= delta;
|
|
|
|
|
|
|
|
/* half rounded */
|
2009-04-07 17:08:26 +00:00
|
|
|
round_box_edges(&wtb, 15, &recttemp, 4.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* decoration */
|
|
|
|
if(state & UI_SELECT) {
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_check_trias(&wtb.tria1, &recttemp);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-04-09 18:11:18 +00:00
|
|
|
|
|
|
|
/* text space */
|
2009-04-23 01:53:11 +00:00
|
|
|
rect->xmin += (rect->ymax-rect->ymin)*0.7 + delta;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
static void widget_radiobut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* half rounded */
|
2009-04-02 15:01:11 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 4.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
static void widget_but(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* half rounded */
|
2009-04-02 15:01:11 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 4.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2009-08-26 00:38:43 +00:00
|
|
|
float rad= 5.0f; //0.5f*(rect->ymax - rect->ymin);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-08-23 21:56:32 +00:00
|
|
|
/* half rounded */
|
2009-08-26 00:38:43 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-06-08 10:00:14 +00:00
|
|
|
static void widget_draw_extra_mask(const bContext *C, uiBut *but, uiWidgetType *wt, rcti *rect)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
char col[4];
|
|
|
|
|
|
|
|
/* state copy! */
|
|
|
|
wt->wcol= *(wt->wcol_theme);
|
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
if(but->block->drawextra) {
|
2009-06-08 16:24:37 +00:00
|
|
|
/* note: drawextra can change rect +1 or -1, to match round errors of existing previews */
|
2009-08-18 19:58:27 +00:00
|
|
|
but->block->drawextra(C, but->poin, but->block->drawextra_arg1, but->block->drawextra_arg2, rect);
|
2009-06-08 10:00:14 +00:00
|
|
|
|
2009-06-08 12:39:39 +00:00
|
|
|
/* make mask to draw over image */
|
|
|
|
UI_GetThemeColor3ubv(TH_BACK, col);
|
2009-07-21 01:57:46 +00:00
|
|
|
glColor3ubv((unsigned char*)col);
|
2009-06-08 12:39:39 +00:00
|
|
|
|
|
|
|
round_box__edges(&wtb, 15, rect, 0.0f, 4.0);
|
|
|
|
widgetbase_outline(&wtb);
|
2009-06-08 10:00:14 +00:00
|
|
|
}
|
2009-06-08 11:27:40 +00:00
|
|
|
|
2009-06-08 10:00:14 +00:00
|
|
|
/* outline */
|
2009-06-08 12:39:39 +00:00
|
|
|
round_box_edges(&wtb, 15, rect, 5.0f);
|
2009-06-08 10:00:14 +00:00
|
|
|
wtb.outline= 1;
|
|
|
|
wtb.inner= 0;
|
2009-06-08 12:39:39 +00:00
|
|
|
widgetbase_draw(&wtb, &wt->wcol);
|
2009-06-08 10:00:14 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
static void widget_disabled(rcti *rect)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-15 17:53:12 +00:00
|
|
|
float col[4];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
glEnable(GL_BLEND);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-15 17:53:12 +00:00
|
|
|
/* can't use theme TH_BACK or TH_PANEL... undefined */
|
|
|
|
glGetFloatv(GL_COLOR_CLEAR_VALUE, col);
|
2009-04-02 15:01:11 +00:00
|
|
|
glColor4f(col[0], col[1], col[2], 0.5f);
|
2009-06-19 23:11:41 +00:00
|
|
|
/* need -1 and +1 to make it work right for aligned buttons,
|
|
|
|
* but problem may be somewhere else? */
|
|
|
|
glRectf(rect->xmin-1, rect->ymin, rect->xmax, rect->ymax+1);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uiWidgetType *widget_type(uiWidgetTypeEnum type)
|
|
|
|
{
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
bTheme *btheme= U.themes.first;
|
2009-04-02 15:01:11 +00:00
|
|
|
static uiWidgetType wt;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* defaults */
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_regular;
|
2009-07-12 02:06:15 +00:00
|
|
|
wt.wcol_state= &btheme->tui.wcol_state;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.state= widget_state;
|
|
|
|
wt.draw= widget_but;
|
2009-04-02 18:16:15 +00:00
|
|
|
wt.custom= NULL;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.text= widget_draw_text_icon;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
switch(type) {
|
2009-06-24 14:16:56 +00:00
|
|
|
case UI_WTYPE_REGULAR:
|
|
|
|
break;
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
case UI_WTYPE_LABEL:
|
|
|
|
wt.draw= NULL;
|
|
|
|
wt.state= widget_state_label;
|
|
|
|
break;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_TOGGLE:
|
2009-06-24 14:16:56 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_toggle;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_OPTION:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_option;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.draw= widget_optionbut;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_RADIO:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_radio;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.draw= widget_radiobut;
|
|
|
|
break;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_NUMBER:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_num;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.draw= widget_numbut;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_SLIDER:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_numslider;
|
2009-04-02 18:16:15 +00:00
|
|
|
wt.custom= widget_numslider;
|
2009-10-15 11:52:23 +00:00
|
|
|
wt.state= widget_state_numslider;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_EXEC:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_tool;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.draw= widget_roundbut;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
/* strings */
|
|
|
|
case UI_WTYPE_NAME:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_text;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.draw= widget_textbut;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_NAME_LINK:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_POINTER_LINK:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_FILENAME:
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* start menus */
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_MENU_RADIO:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_menu;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.draw= widget_menubut;
|
|
|
|
break;
|
2009-09-28 15:59:09 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_MENU_ICON_RADIO:
|
|
|
|
wt.wcol_theme= &btheme->tui.wcol_menu;
|
|
|
|
wt.draw= widget_menuiconbut;
|
|
|
|
break;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_MENU_POINTER_LINK:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_menu;
|
2009-04-02 15:01:11 +00:00
|
|
|
wt.draw= widget_menubut;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_PULLDOWN:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_pulldown;
|
2009-04-03 16:26:03 +00:00
|
|
|
wt.draw= widget_pulldownbut;
|
|
|
|
wt.state= widget_state_pulldown;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* in menus */
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_MENU_ITEM:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_menu_item;
|
2009-04-03 16:26:03 +00:00
|
|
|
wt.draw= widget_menu_itembut;
|
|
|
|
wt.state= widget_state_menu_item;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case UI_WTYPE_MENU_BACK:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt.wcol_theme= &btheme->tui.wcol_menu_back;
|
2009-04-03 16:26:03 +00:00
|
|
|
wt.draw= widget_menu_back;
|
|
|
|
break;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
/* specials */
|
|
|
|
case UI_WTYPE_ICON:
|
2009-04-03 16:26:03 +00:00
|
|
|
wt.draw= NULL;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_SWATCH:
|
2009-04-03 16:26:03 +00:00
|
|
|
wt.custom= widget_swatch;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
2009-06-01 11:31:06 +00:00
|
|
|
case UI_WTYPE_BOX:
|
|
|
|
wt.wcol_theme= &btheme->tui.wcol_box;
|
|
|
|
break;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_RGB_PICKER:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_NORMAL:
|
|
|
|
break;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_SCROLL:
|
|
|
|
wt.wcol_theme= &btheme->tui.wcol_scroll;
|
2009-07-02 18:12:46 +00:00
|
|
|
wt.state= widget_state_nothing;
|
2009-06-24 14:16:56 +00:00
|
|
|
wt.custom= widget_scroll;
|
|
|
|
break;
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_LISTITEM:
|
|
|
|
wt.wcol_theme= &btheme->tui.wcol_list_item;
|
|
|
|
wt.draw= widget_list_itembut;
|
|
|
|
break;
|
2009-04-02 15:01:11 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
return &wt;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int widget_roundbox_set(uiBut *but, rcti *rect)
|
|
|
|
{
|
|
|
|
/* alignment */
|
|
|
|
if(but->flag & UI_BUT_ALIGN) {
|
|
|
|
|
|
|
|
if(but->flag & UI_BUT_ALIGN_TOP)
|
|
|
|
rect->ymax+= 1;
|
|
|
|
if(but->flag & UI_BUT_ALIGN_LEFT)
|
|
|
|
rect->xmin-= 1;
|
|
|
|
|
|
|
|
switch(but->flag & UI_BUT_ALIGN) {
|
|
|
|
case UI_BUT_ALIGN_TOP:
|
|
|
|
return (12);
|
|
|
|
break;
|
|
|
|
case UI_BUT_ALIGN_DOWN:
|
|
|
|
return (3);
|
|
|
|
break;
|
|
|
|
case UI_BUT_ALIGN_LEFT:
|
|
|
|
return (6);
|
|
|
|
break;
|
|
|
|
case UI_BUT_ALIGN_RIGHT:
|
|
|
|
return (9);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_RIGHT:
|
|
|
|
return (1);
|
|
|
|
break;
|
|
|
|
case UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT:
|
|
|
|
return (2);
|
|
|
|
break;
|
|
|
|
case UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_RIGHT:
|
|
|
|
return (8);
|
|
|
|
break;
|
|
|
|
case UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_LEFT:
|
|
|
|
return (4);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return (0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 15;
|
|
|
|
}
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* conversion from old to new buttons, so still messy */
|
2009-06-08 10:00:14 +00:00
|
|
|
void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rcti *rect)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
bTheme *btheme= U.themes.first;
|
|
|
|
ThemeUI *tui= &btheme->tui;
|
|
|
|
uiFontStyle *fstyle= &style->widget;
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetType *wt= NULL;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-11-02 17:25:15 +00:00
|
|
|
/* handle menus separately */
|
2009-04-03 16:26:03 +00:00
|
|
|
if(but->dt==UI_EMBOSSP) {
|
|
|
|
switch (but->type) {
|
|
|
|
case LABEL:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
widget_draw_text_icon(&style->widgetlabel, &tui->wcol_menu_back, but, rect);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
|
|
|
case SEPR:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
wt= widget_type(UI_WTYPE_MENU_ITEM);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(but->dt==UI_EMBOSSN) {
|
|
|
|
/* "nothing" */
|
|
|
|
wt= widget_type(UI_WTYPE_ICON);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
switch (but->type) {
|
|
|
|
case LABEL:
|
|
|
|
if(but->block->flag & UI_BLOCK_LOOP)
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
widget_draw_text_icon(&style->widgetlabel, &tui->wcol_menu_back, but, rect);
|
|
|
|
else {
|
|
|
|
wt= widget_type(UI_WTYPE_LABEL);
|
|
|
|
fstyle= &style->widgetlabel;
|
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case SEPR:
|
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case BUT:
|
2009-11-19 09:57:04 +00:00
|
|
|
wt= widget_type(UI_WTYPE_EXEC);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case NUM:
|
|
|
|
wt= widget_type(UI_WTYPE_NUMBER);
|
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case NUMSLI:
|
|
|
|
case HSVSLI:
|
|
|
|
wt= widget_type(UI_WTYPE_SLIDER);
|
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case ROW:
|
|
|
|
wt= widget_type(UI_WTYPE_RADIO);
|
|
|
|
break;
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
case LISTROW:
|
|
|
|
wt= widget_type(UI_WTYPE_LISTITEM);
|
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case TEX:
|
2009-06-10 11:43:21 +00:00
|
|
|
wt= widget_type(UI_WTYPE_NAME);
|
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-06-02 18:10:06 +00:00
|
|
|
case SEARCH_MENU:
|
2009-04-03 16:26:03 +00:00
|
|
|
wt= widget_type(UI_WTYPE_NAME);
|
2009-06-10 11:43:21 +00:00
|
|
|
if(but->block->flag & UI_BLOCK_LOOP)
|
|
|
|
wt->wcol_theme= &btheme->tui.wcol_menu_back;
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-12 13:40:29 +00:00
|
|
|
case TOGBUT:
|
2009-04-03 16:26:03 +00:00
|
|
|
case TOG:
|
|
|
|
case TOGN:
|
|
|
|
case TOG3:
|
2009-05-27 00:03:49 +00:00
|
|
|
wt= widget_type(UI_WTYPE_TOGGLE);
|
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-05-27 00:03:49 +00:00
|
|
|
case OPTION:
|
|
|
|
case OPTIONN:
|
2009-04-09 18:11:18 +00:00
|
|
|
if (!(but->flag & UI_HAS_ICON)) {
|
2009-04-03 16:26:03 +00:00
|
|
|
wt= widget_type(UI_WTYPE_OPTION);
|
2009-04-09 18:11:18 +00:00
|
|
|
but->flag |= UI_TEXT_LEFT;
|
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
else
|
|
|
|
wt= widget_type(UI_WTYPE_TOGGLE);
|
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case MENU:
|
|
|
|
case BLOCK:
|
|
|
|
case ICONTEXTROW:
|
2009-09-28 15:59:09 +00:00
|
|
|
if(!but->str[0] && but->icon)
|
|
|
|
wt= widget_type(UI_WTYPE_MENU_ICON_RADIO);
|
|
|
|
else
|
|
|
|
wt= widget_type(UI_WTYPE_MENU_RADIO);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PULLDOWN:
|
|
|
|
wt= widget_type(UI_WTYPE_PULLDOWN);
|
|
|
|
break;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case BUTM:
|
|
|
|
wt= widget_type(UI_WTYPE_MENU_ITEM);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case COL:
|
|
|
|
wt= widget_type(UI_WTYPE_SWATCH);
|
|
|
|
break;
|
2009-06-01 11:31:06 +00:00
|
|
|
|
|
|
|
case ROUNDBOX:
|
2009-07-21 01:26:17 +00:00
|
|
|
case LISTBOX:
|
2009-06-01 11:31:06 +00:00
|
|
|
wt= widget_type(UI_WTYPE_BOX);
|
|
|
|
break;
|
2009-06-17 11:01:05 +00:00
|
|
|
|
|
|
|
case LINK:
|
|
|
|
case INLINK:
|
|
|
|
wt= widget_type(UI_WTYPE_ICON);
|
|
|
|
wt->custom= widget_link;
|
|
|
|
|
|
|
|
break;
|
2009-06-08 10:00:14 +00:00
|
|
|
|
|
|
|
case BUT_EXTRA:
|
|
|
|
widget_draw_extra_mask(C, but, widget_type(UI_WTYPE_BOX), rect);
|
|
|
|
break;
|
2009-06-01 11:31:06 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case HSVCUBE:
|
2009-06-12 14:22:27 +00:00
|
|
|
if(but->a1==4) // vertical V slider, uses new widget draw now
|
|
|
|
ui_draw_but_HSV_v(but, rect);
|
|
|
|
else // other HSV pickers...
|
|
|
|
ui_draw_but_HSVCUBE(but, rect);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HSVCIRCLE:
|
|
|
|
ui_draw_but_HSVCIRCLE(but, rect);
|
2009-04-06 15:44:30 +00:00
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-06 15:44:30 +00:00
|
|
|
case BUT_COLORBAND:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
ui_draw_but_COLORBAND(but, &tui->wcol_regular, rect);
|
2009-04-06 15:44:30 +00:00
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-06 15:44:30 +00:00
|
|
|
case BUT_NORMAL:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
ui_draw_but_NORMAL(but, &tui->wcol_regular, rect);
|
2009-04-06 15:44:30 +00:00
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-11-23 13:58:55 +00:00
|
|
|
case BUT_IMAGE:
|
|
|
|
ui_draw_but_IMAGE(ar, but, &tui->wcol_regular, rect);
|
|
|
|
break;
|
|
|
|
|
2009-04-06 15:44:30 +00:00
|
|
|
case BUT_CURVE:
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
ui_draw_but_CURVE(ar, but, &tui->wcol_regular, rect);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
|
|
|
case SCROLL:
|
|
|
|
wt= widget_type(UI_WTYPE_SCROLL);
|
|
|
|
break;
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
default:
|
2009-06-24 14:16:56 +00:00
|
|
|
wt= widget_type(UI_WTYPE_REGULAR);
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
if(wt) {
|
2009-04-12 13:40:29 +00:00
|
|
|
rcti disablerect= *rect; /* rect gets clipped smaller for text */
|
2009-04-02 15:01:11 +00:00
|
|
|
int roundboxalign, state;
|
|
|
|
|
2009-04-09 18:11:18 +00:00
|
|
|
roundboxalign= widget_roundbox_set(but, rect);
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
state= but->flag;
|
|
|
|
if(but->editstr) state |= UI_TEXTINPUT;
|
|
|
|
|
|
|
|
wt->state(wt, state);
|
2009-04-02 18:16:15 +00:00
|
|
|
if(wt->custom)
|
2009-04-09 18:11:18 +00:00
|
|
|
wt->custom(but, &wt->wcol, rect, state, roundboxalign);
|
2009-04-03 16:26:03 +00:00
|
|
|
else if(wt->draw)
|
2009-04-09 18:11:18 +00:00
|
|
|
wt->draw(&wt->wcol, rect, state, roundboxalign);
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
wt->text(fstyle, &wt->wcol, but, rect);
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2009-05-28 23:37:55 +00:00
|
|
|
if(state & (UI_BUT_DISABLED|UI_BUT_INACTIVE))
|
2009-04-12 13:40:29 +00:00
|
|
|
if(but->dt!=UI_EMBOSSP)
|
|
|
|
widget_disabled(&disablerect);
|
2009-04-02 15:01:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-10 14:06:24 +00:00
|
|
|
void ui_draw_menu_back(uiStyle *style, uiBlock *block, rcti *rect)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
|
|
|
uiWidgetType *wt= widget_type(UI_WTYPE_MENU_BACK);
|
|
|
|
|
|
|
|
wt->state(wt, 0);
|
2009-04-15 14:43:54 +00:00
|
|
|
if(block)
|
|
|
|
wt->draw(&wt->wcol, rect, block->flag, block->direction);
|
|
|
|
else
|
|
|
|
wt->draw(&wt->wcol, rect, 0, 0);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
}
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2009-06-03 18:31:37 +00:00
|
|
|
void ui_draw_search_back(uiStyle *style, uiBlock *block, rcti *rect)
|
|
|
|
{
|
|
|
|
uiWidgetType *wt= widget_type(UI_WTYPE_BOX);
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
widget_softshadow(rect, 15, 5.0f, 8.0f);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
|
|
|
wt->state(wt, 0);
|
|
|
|
if(block)
|
|
|
|
wt->draw(&wt->wcol, rect, block->flag, 15);
|
|
|
|
else
|
|
|
|
wt->draw(&wt->wcol, rect, 0, 15);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-02 18:10:06 +00:00
|
|
|
/* helper call to draw a menu item without button */
|
|
|
|
/* state: UI_ACTIVE or 0 */
|
2009-06-24 16:44:54 +00:00
|
|
|
void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, char *name, int iconid, int state)
|
2009-06-02 18:10:06 +00:00
|
|
|
{
|
|
|
|
uiWidgetType *wt= widget_type(UI_WTYPE_MENU_ITEM);
|
|
|
|
rcti _rect= *rect;
|
|
|
|
char *cpoin;
|
|
|
|
|
|
|
|
wt->state(wt, state);
|
|
|
|
wt->draw(&wt->wcol, rect, 0, 0);
|
|
|
|
|
|
|
|
uiStyleFontSet(fstyle);
|
|
|
|
fstyle->align= UI_STYLE_TEXT_LEFT;
|
|
|
|
|
|
|
|
/* text location offset */
|
|
|
|
rect->xmin+=5;
|
2009-06-24 16:44:54 +00:00
|
|
|
if(iconid) rect->xmin+= ICON_HEIGHT;
|
2009-06-02 18:10:06 +00:00
|
|
|
|
|
|
|
/* cut string in 2 parts? */
|
|
|
|
cpoin= strchr(name, '|');
|
2009-06-03 18:31:37 +00:00
|
|
|
if(cpoin) {
|
|
|
|
*cpoin= 0;
|
2009-06-04 14:32:10 +00:00
|
|
|
rect->xmax -= BLF_width(cpoin+1) + 10;
|
2009-06-03 18:31:37 +00:00
|
|
|
}
|
2009-06-02 18:10:06 +00:00
|
|
|
|
2009-07-21 01:26:17 +00:00
|
|
|
glColor3ubv((unsigned char*)wt->wcol.text);
|
2009-06-02 18:10:06 +00:00
|
|
|
uiStyleFontDraw(fstyle, rect, name);
|
|
|
|
|
|
|
|
/* part text right aligned */
|
|
|
|
if(cpoin) {
|
|
|
|
fstyle->align= UI_STYLE_TEXT_RIGHT;
|
2009-06-03 18:31:37 +00:00
|
|
|
rect->xmax= _rect.xmax - 5;
|
2009-06-02 18:10:06 +00:00
|
|
|
uiStyleFontDraw(fstyle, rect, cpoin+1);
|
|
|
|
*cpoin= '|';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* restore rect, was messed with */
|
|
|
|
*rect= _rect;
|
|
|
|
|
2009-06-24 16:44:54 +00:00
|
|
|
if(iconid) {
|
|
|
|
int xs= rect->xmin+4;
|
|
|
|
int ys= 1 + (rect->ymin+rect->ymax- ICON_HEIGHT)/2;
|
|
|
|
glEnable(GL_BLEND);
|
Sorry, three commits in one, became difficult to untangle..
Editors Modules
* render/ module added in editors, moved the preview render code there and
also shading related operators.
* physics/ module made more consistent with other modules. renaming files,
making a single physics_ops.c for operators and keymaps. Also move all
particle related operators here now.
* space_buttons/ now should have only operators relevant to the buttons
specificially.
Updates & Notifiers
* Material/Texture/World/Lamp can now be passed to DAG_id_flush_update,
which will go back to a callback in editors. Eventually these should
be in the depsgraph itself, but for now this gives a unified call for
doing updates.
* GLSL materials are now refreshed on changes. There's still various
cases missing,
* Preview icons now hook into this system, solving various update cases
that were missed before.
* Also fixes issue in my last commit, where some preview would not render,
problem is avoided in the new system.
Icon Rendering
* On systems with support for non-power of two textures, an OpenGL texture
is now used instead of glDrawPixels. This avoids problems with icons get
clipped on region borders. On my Linux desktop, this gives an 1.1x speedup,
and on my Mac laptop a 2.3x speedup overall in redrawing the full window,
with the default setup. The glDrawPixels implementation on Mac seems to
have a lot of overhread.
* Preview icons are now drawn using proper premul alpha, and never faded so
you can see them clearly.
* Also tried to fix issue with texture node preview rendering, globals can't
be used with threads reliably.
2009-09-29 19:12:12 +00:00
|
|
|
UI_icon_draw_aspect(xs, ys, iconid, 1.2f, 0.5f); /* XXX scale weak get from fstyle? */
|
2009-06-24 16:44:54 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
2009-06-02 18:10:06 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|