2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2011-10-23 17:52:20 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
2009-03-25 16:58:42 +00:00
|
|
|
*
|
|
|
|
* 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-03-25 16:58:42 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Contributor(s): Blender Foundation
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
2011-02-27 20:29:51 +00:00
|
|
|
/** \file blender/editors/interface/interface_widgets.c
|
|
|
|
* \ingroup edinterface
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
#include <limits.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2010-10-17 08:59:23 +00:00
|
|
|
#include <assert.h>
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
#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
|
|
|
|
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"
|
2010-12-14 02:38:29 +00:00
|
|
|
#include "BLI_string.h"
|
2012-03-22 09:20:22 +00:00
|
|
|
#include "BLI_string_utf8.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
#include "BKE_context.h"
|
2009-06-17 11:01:05 +00:00
|
|
|
#include "BKE_curve.h"
|
2009-03-25 16:58:42 +00:00
|
|
|
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
#include "RNA_access.h"
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
#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 "interface_intern.h"
|
|
|
|
|
2013-12-18 17:11:38 +11:00
|
|
|
/* icons are 80% of height of button (16 pixels inside 20 height) */
|
|
|
|
#define ICON_SIZE_FROM_BUTRECT(rect) (0.8f * BLI_rcti_size_y(rect))
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* ************** widget base functions ************** */
|
|
|
|
/*
|
2012-03-03 16:31:46 +00:00
|
|
|
* - 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
|
2009-03-25 16:58:42 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* fill this struct with polygon info to draw AA'ed */
|
|
|
|
/* it has outline, back, and two optional tria meshes */
|
|
|
|
|
|
|
|
typedef struct uiWidgetTrias {
|
2011-09-10 01:39:21 +00:00
|
|
|
unsigned int tot;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2013-05-08 12:56:11 +00:00
|
|
|
float vec[16][2];
|
2013-04-30 01:51:25 +00:00
|
|
|
const unsigned int (*index)[3];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
} uiWidgetTrias;
|
|
|
|
|
2011-09-09 13:10:18 +00:00
|
|
|
/* max as used by round_box__edges */
|
|
|
|
#define WIDGET_CURVE_RESOLU 9
|
2012-03-30 01:51:25 +00:00
|
|
|
#define WIDGET_SIZE_MAX (WIDGET_CURVE_RESOLU * 4)
|
2011-09-09 13:10:18 +00:00
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
typedef struct uiWidgetBase {
|
|
|
|
|
|
|
|
int totvert, halfwayvert;
|
2011-09-09 13:10:18 +00:00
|
|
|
float outer_v[WIDGET_SIZE_MAX][2];
|
|
|
|
float inner_v[WIDGET_SIZE_MAX][2];
|
|
|
|
float inner_uv[WIDGET_SIZE_MAX][2];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2013-07-19 10:39:44 +00:00
|
|
|
bool inner, outline, emboss, 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,
|
2012-03-03 16:31:46 +00:00
|
|
|
* later, a handling callback can be added too
|
|
|
|
*/
|
2009-04-02 15:01:11 +00:00
|
|
|
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);
|
2013-12-07 15:47:57 +11:00
|
|
|
void (*text)(uiFontStyle *, uiWidgetColors *, uiBut *, rcti *);
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
} uiWidgetType;
|
|
|
|
|
|
|
|
|
|
|
|
/* *********************** draw data ************************** */
|
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const float cornervec[WIDGET_CURVE_RESOLU][2] = {
|
2012-05-20 19:49:27 +00:00
|
|
|
{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}
|
|
|
|
};
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-01-13 09:26:06 +00:00
|
|
|
#define WIDGET_AA_JITTER 8
|
2013-04-30 01:51:25 +00:00
|
|
|
static const float jit[WIDGET_AA_JITTER][2] = {
|
2012-03-30 01:51:25 +00:00
|
|
|
{ 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}
|
|
|
|
};
|
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const float num_tria_vert[3][2] = {
|
2012-03-30 01:51:25 +00:00
|
|
|
{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.330000, -0.008353}
|
|
|
|
};
|
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const unsigned int num_tria_face[1][3] = {
|
2012-03-30 01:51:25 +00:00
|
|
|
{0, 1, 2}
|
|
|
|
};
|
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const float scroll_circle_vert[16][2] = {
|
2012-03-30 01:51:25 +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},
|
|
|
|
{0.923880, -0.382684}, {1.000000, -0.000000}, {0.923880, 0.382683}, {0.707107, 0.707107}
|
|
|
|
};
|
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const unsigned int scroll_circle_face[14][3] = {
|
2012-03-30 01:51:25 +00:00
|
|
|
{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}
|
|
|
|
};
|
|
|
|
|
2012-05-22 15:50:13 +00:00
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const float menu_tria_vert[6][2] = {
|
2012-06-05 21:54:21 +00:00
|
|
|
{-0.33, 0.16}, {0.33, 0.16}, {0, 0.82},
|
|
|
|
{0, -0.82}, {-0.33, -0.16}, {0.33, -0.16}
|
|
|
|
};
|
2012-05-22 15:50:13 +00:00
|
|
|
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const unsigned int menu_tria_face[2][3] = {{2, 0, 1}, {3, 5, 4}};
|
2012-03-30 01:51:25 +00:00
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const float check_tria_vert[6][2] = {
|
2012-03-30 01:51:25 +00:00
|
|
|
{-0.578579, 0.253369}, {-0.392773, 0.412794}, {-0.004241, -0.328551},
|
|
|
|
{-0.003001, 0.034320}, {1.055313, 0.864744}, {0.866408, 1.026895}
|
|
|
|
};
|
|
|
|
|
2013-04-30 01:51:25 +00:00
|
|
|
static const unsigned int check_tria_face[4][3] = {
|
2012-03-30 01:51:25 +00:00
|
|
|
{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)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
float tri_arr[3][2] = {{x1, y1}, {x2, y2}, {x3, y3}};
|
2009-04-02 15:01:11 +00:00
|
|
|
float color[4];
|
|
|
|
int j;
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glGetFloatv(GL_CURRENT_COLOR, color);
|
2011-08-19 16:21:29 +00:00
|
|
|
color[3] *= 0.125f;
|
2009-04-02 15:01:11 +00:00
|
|
|
glColor4fv(color);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, tri_arr);
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* for each AA step */
|
2012-01-13 09:26:06 +00:00
|
|
|
for (j = 0; j < WIDGET_AA_JITTER; j++) {
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(jit[j][0], jit[j][1], 0.0f);
|
2011-09-09 14:44:36 +00:00
|
|
|
glDrawArrays(GL_TRIANGLES, 0, 3);
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
|
2009-04-02 15:01:11 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2011-09-09 14:44:36 +00:00
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
2009-04-02 15:01:11 +00:00
|
|
|
glDisable(GL_BLEND);
|
2011-12-16 22:00:53 +00:00
|
|
|
}
|
|
|
|
|
2013-03-07 06:46:50 +00:00
|
|
|
void ui_draw_anti_roundbox(int mode, float minx, float miny, float maxx, float maxy, float rad, bool use_alpha)
|
2011-12-16 22:00:53 +00:00
|
|
|
{
|
|
|
|
float color[4];
|
|
|
|
int j;
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glGetFloatv(GL_CURRENT_COLOR, color);
|
2013-03-07 06:46:50 +00:00
|
|
|
if (use_alpha) {
|
|
|
|
color[3] = 0.5f;
|
|
|
|
}
|
2011-12-16 22:00:53 +00:00
|
|
|
color[3] *= 0.125f;
|
|
|
|
glColor4fv(color);
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (j = 0; j < WIDGET_AA_JITTER; j++) {
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(jit[j][0], jit[j][1], 0.0f);
|
2011-12-16 22:00:53 +00:00
|
|
|
uiDrawBox(mode, minx, miny, maxx, maxy, rad);
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
|
2011-12-16 22:00:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
2009-04-02 15:01:11 +00:00
|
|
|
}
|
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
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb->totvert = wtb->halfwayvert = 0;
|
|
|
|
wtb->tria1.tot = 0;
|
|
|
|
wtb->tria2.tot = 0;
|
|
|
|
|
|
|
|
wtb->inner = 1;
|
|
|
|
wtb->outline = 1;
|
|
|
|
wtb->emboss = 1;
|
|
|
|
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 */
|
2012-12-13 02:40:49 +00:00
|
|
|
static int round_box_shadow_edges(float (*vert)[2], const rcti *rect, float rad, int roundboxalign, float step)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
2011-09-09 13:10:18 +00:00
|
|
|
float vec[WIDGET_CURVE_RESOLU][2];
|
2009-04-03 16:26:03 +00:00
|
|
|
float minx, miny, maxx, maxy;
|
2012-03-30 01:51:25 +00:00
|
|
|
int a, tot = 0;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
rad += step;
|
2009-04-15 14:43:54 +00:00
|
|
|
|
2012-09-15 11:48:20 +00:00
|
|
|
if (2.0f * rad > BLI_rcti_size_y(rect))
|
|
|
|
rad = 0.5f * BLI_rcti_size_y(rect);
|
2012-12-20 16:50:39 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
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 */
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++) {
|
|
|
|
vec[a][0] = rad * cornervec[a][0];
|
|
|
|
vec[a][1] = rad * cornervec[a][1];
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* start with left-top, anti clockwise */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_TOP_LEFT) {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = minx + rad - vec[a][0];
|
|
|
|
vert[tot][1] = maxy - vec[a][1];
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = minx;
|
|
|
|
vert[tot][1] = maxy;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_BOTTOM_LEFT) {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = minx + vec[a][1];
|
|
|
|
vert[tot][1] = miny + rad - vec[a][0];
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = minx;
|
|
|
|
vert[tot][1] = miny;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_BOTTOM_RIGHT) {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = maxx - rad + vec[a][0];
|
|
|
|
vert[tot][1] = miny + vec[a][1];
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = maxx;
|
|
|
|
vert[tot][1] = miny;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_TOP_RIGHT) {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = maxx - vec[a][1];
|
|
|
|
vert[tot][1] = maxy - rad + vec[a][0];
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
vert[tot][0] = maxx;
|
|
|
|
vert[tot][1] = maxy;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
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 */
|
2012-12-13 02:40:49 +00:00
|
|
|
static void round_box__edges(uiWidgetBase *wt, int roundboxalign, const rcti *rect, float rad, float radi)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2011-09-09 13:10:18 +00:00
|
|
|
float vec[WIDGET_CURVE_RESOLU][2], veci[WIDGET_CURVE_RESOLU][2];
|
2012-03-30 01:51:25 +00:00
|
|
|
float minx = rect->xmin, miny = rect->ymin, maxx = rect->xmax, maxy = rect->ymax;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float minxi = minx + U.pixelsize; /* boundbox inner */
|
|
|
|
float maxxi = maxx - U.pixelsize;
|
|
|
|
float minyi = miny + U.pixelsize;
|
|
|
|
float maxyi = maxy - U.pixelsize;
|
2012-03-30 01:51:25 +00:00
|
|
|
float facxi = (maxxi != minxi) ? 1.0f / (maxxi - minxi) : 0.0f; /* for uv, can divide by zero */
|
|
|
|
float facyi = (maxyi != minyi) ? 1.0f / (maxyi - minyi) : 0.0f;
|
|
|
|
int a, tot = 0, minsize;
|
|
|
|
const int hnum = ((roundboxalign & (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT)) == (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT) ||
|
|
|
|
(roundboxalign & (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)) == (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)) ? 1 : 2;
|
|
|
|
const int vnum = ((roundboxalign & (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)) == (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT) ||
|
|
|
|
(roundboxalign & (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) == (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) ? 1 : 2;
|
|
|
|
|
2012-10-23 13:28:22 +00:00
|
|
|
minsize = min_ii(BLI_rcti_size_x(rect) * hnum,
|
2013-01-21 18:45:31 +00:00
|
|
|
BLI_rcti_size_y(rect) * vnum);
|
2012-03-30 01:51:25 +00:00
|
|
|
|
|
|
|
if (2.0f * rad > minsize)
|
|
|
|
rad = 0.5f * minsize;
|
|
|
|
|
|
|
|
if (2.0f * (radi + 1.0f) > minsize)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
radi = 0.5f * minsize - U.pixelsize;
|
2009-04-15 14:43:54 +00:00
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* mult */
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; 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];
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* corner left-bottom */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_BOTTOM_LEFT) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0] = minxi + veci[a][1];
|
|
|
|
wt->inner_v[tot][1] = minyi + radi - veci[a][0];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = minx + vec[a][1];
|
|
|
|
wt->outer_v[tot][1] = miny + rad - vec[a][0];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_v[tot][0] = minxi;
|
|
|
|
wt->inner_v[tot][1] = minyi;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = minx;
|
|
|
|
wt->outer_v[tot][1] = miny;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = 0.0f;
|
|
|
|
wt->inner_uv[tot][1] = 0.0f;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* corner right-bottom */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_BOTTOM_RIGHT) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0] = maxxi - radi + veci[a][0];
|
|
|
|
wt->inner_v[tot][1] = minyi + veci[a][1];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = maxx - rad + vec[a][0];
|
|
|
|
wt->outer_v[tot][1] = miny + vec[a][1];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_v[tot][0] = maxxi;
|
|
|
|
wt->inner_v[tot][1] = minyi;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = maxx;
|
|
|
|
wt->outer_v[tot][1] = miny;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = 1.0f;
|
|
|
|
wt->inner_uv[tot][1] = 0.0f;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->halfwayvert = tot;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* corner right-top */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_TOP_RIGHT) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0] = maxxi - veci[a][1];
|
|
|
|
wt->inner_v[tot][1] = maxyi - radi + veci[a][0];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = maxx - vec[a][1];
|
|
|
|
wt->outer_v[tot][1] = maxy - rad + vec[a][0];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_v[tot][0] = maxxi;
|
|
|
|
wt->inner_v[tot][1] = maxyi;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = maxx;
|
|
|
|
wt->outer_v[tot][1] = maxy;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = 1.0f;
|
|
|
|
wt->inner_uv[tot][1] = 1.0f;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* corner left-top */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (roundboxalign & UI_CNR_TOP_LEFT) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
|
|
|
|
wt->inner_v[tot][0] = minxi + radi - veci[a][0];
|
|
|
|
wt->inner_v[tot][1] = maxyi - veci[a][1];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = minx + rad - vec[a][0];
|
|
|
|
wt->outer_v[tot][1] = maxy - vec[a][1];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
|
|
|
|
wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_v[tot][0] = minxi;
|
|
|
|
wt->inner_v[tot][1] = maxyi;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->outer_v[tot][0] = minx;
|
|
|
|
wt->outer_v[tot][1] = maxy;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->inner_uv[tot][0] = 0.0f;
|
|
|
|
wt->inner_uv[tot][1] = 1.0f;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
tot++;
|
|
|
|
}
|
2011-09-09 13:10:18 +00:00
|
|
|
|
|
|
|
BLI_assert(tot <= WIDGET_SIZE_MAX);
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->totvert = tot;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2012-12-13 02:40:49 +00:00
|
|
|
static void round_box_edges(uiWidgetBase *wt, int roundboxalign, const rcti *rect, float rad)
|
2009-06-08 12:39:39 +00:00
|
|
|
{
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
round_box__edges(wt, roundboxalign, rect, rad, rad - U.pixelsize);
|
2009-06-08 12:39:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* based on button rect, return scaled array of triangles */
|
2012-12-13 02:40:49 +00:00
|
|
|
static void widget_num_tria(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-07-03 13:21:09 +00:00
|
|
|
float centx, centy, sizex, sizey, minsize;
|
2012-03-30 01:51:25 +00:00
|
|
|
int a, i1 = 0, i2 = 1;
|
2009-07-03 13:21:09 +00:00
|
|
|
|
2012-10-23 13:28:22 +00:00
|
|
|
minsize = min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect));
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* center position and size */
|
2012-03-30 01:51:25 +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
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (where == 'r') {
|
|
|
|
centx = (float)rect->xmax - 0.5f * minsize;
|
|
|
|
sizex = -sizex;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2012-03-30 01:51:25 +00:00
|
|
|
else if (where == 't') {
|
|
|
|
centy = (float)rect->ymax - 0.5f * minsize;
|
|
|
|
sizey = -sizey;
|
|
|
|
i2 = 0; i1 = 1;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2012-03-30 01:51:25 +00:00
|
|
|
else if (where == 'b') {
|
|
|
|
sizex = -sizex;
|
|
|
|
i2 = 0; i1 = 1;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < 3; a++) {
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
tria->tot = 1;
|
|
|
|
tria->index = num_tria_face;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2012-12-13 02:40:49 +00:00
|
|
|
static void widget_scroll_circle(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
|
2009-09-14 12:28:59 +00:00
|
|
|
{
|
|
|
|
float centx, centy, sizex, sizey, minsize;
|
2012-03-30 01:51:25 +00:00
|
|
|
int a, i1 = 0, i2 = 1;
|
2009-09-14 12:28:59 +00:00
|
|
|
|
2012-10-23 13:28:22 +00:00
|
|
|
minsize = min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect));
|
2009-09-14 12:28:59 +00:00
|
|
|
|
|
|
|
/* center position and size */
|
2012-03-30 01:51:25 +00:00
|
|
|
centx = (float)rect->xmin + 0.5f * minsize;
|
|
|
|
centy = (float)rect->ymin + 0.5f * minsize;
|
|
|
|
sizex = sizey = -0.5f * triasize * minsize;
|
2009-09-14 12:28:59 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (where == 'r') {
|
|
|
|
centx = (float)rect->xmax - 0.5f * minsize;
|
|
|
|
sizex = -sizex;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2012-03-30 01:51:25 +00:00
|
|
|
else if (where == 't') {
|
|
|
|
centy = (float)rect->ymax - 0.5f * minsize;
|
|
|
|
sizey = -sizey;
|
|
|
|
i2 = 0; i1 = 1;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2012-03-30 01:51:25 +00:00
|
|
|
else if (where == 'b') {
|
|
|
|
sizex = -sizex;
|
|
|
|
i2 = 0; i1 = 1;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-09-14 12:28:59 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
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;
|
2009-09-14 12:28:59 +00:00
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
tria->tot = 14;
|
|
|
|
tria->index = scroll_circle_face;
|
2009-09-14 12:28:59 +00:00
|
|
|
}
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
static void widget_trias_draw(uiWidgetTrias *tria)
|
|
|
|
{
|
2011-09-09 14:44:36 +00:00
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, tria->vec);
|
2012-03-30 01:51:25 +00:00
|
|
|
glDrawElements(GL_TRIANGLES, tria->tot * 3, GL_UNSIGNED_INT, tria->index);
|
2011-09-09 14:44:36 +00:00
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2012-12-13 02:40:49 +00:00
|
|
|
static void widget_menu_trias(uiWidgetTrias *tria, const rcti *rect)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2012-12-18 20:00:52 +00:00
|
|
|
float centx, centy, size;
|
2009-03-25 16:58:42 +00:00
|
|
|
int a;
|
|
|
|
|
|
|
|
/* center position and size */
|
2012-12-18 20:00:52 +00:00
|
|
|
centx = rect->xmax - 0.32f * BLI_rcti_size_y(rect);
|
|
|
|
centy = rect->ymin + 0.50f * BLI_rcti_size_y(rect);
|
2012-10-25 10:51:03 +00:00
|
|
|
size = 0.4f * (float)BLI_rcti_size_y(rect);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +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;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
tria->tot = 2;
|
|
|
|
tria->index = menu_tria_face;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2012-12-13 02:40:49 +00:00
|
|
|
static void widget_check_trias(uiWidgetTrias *tria, const rcti *rect)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
|
|
|
float centx, centy, size;
|
|
|
|
int a;
|
|
|
|
|
|
|
|
/* center position and size */
|
2012-09-15 11:48:20 +00:00
|
|
|
centx = rect->xmin + 0.5f * BLI_rcti_size_y(rect);
|
|
|
|
centy = rect->ymin + 0.5f * BLI_rcti_size_y(rect);
|
|
|
|
size = 0.5f * BLI_rcti_size_y(rect);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
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;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
tria->tot = 4;
|
|
|
|
tria->index = check_tria_face;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* prepares shade colors */
|
2013-12-07 15:47:57 +11:00
|
|
|
static void shadecolors4(char coltop[4], char coldown[4], const char *color, short shadetop, short shadedown)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
|
|
|
|
2012-03-30 01:51:25 +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);
|
|
|
|
coltop[3] = color[3];
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +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);
|
|
|
|
coldown[3] = color[3];
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2011-09-09 14:44:36 +00:00
|
|
|
static void round_box_shade_col4_r(unsigned char col_r[4], const char col1[4], const char col2[4], const float fac)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
const int faci = FTOCHAR(fac);
|
|
|
|
const int facm = 255 - faci;
|
2011-09-09 14:44:36 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
col_r[0] = (faci * col1[0] + facm * col2[0]) >> 8;
|
|
|
|
col_r[1] = (faci * col1[1] + facm * col2[1]) >> 8;
|
|
|
|
col_r[2] = (faci * col1[2] + facm * col2[2]) >> 8;
|
|
|
|
col_r[3] = (faci * col1[3] + facm * col2[3]) >> 8;
|
2011-09-09 14:44:36 +00:00
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static void widget_verts_to_quad_strip(uiWidgetBase *wtb, const int totvert, float quad_strip[WIDGET_SIZE_MAX * 2 + 2][2])
|
2009-06-08 12:39:39 +00:00
|
|
|
{
|
|
|
|
int a;
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < totvert; a++) {
|
|
|
|
copy_v2_v2(quad_strip[a * 2], wtb->outer_v[a]);
|
|
|
|
copy_v2_v2(quad_strip[a * 2 + 1], wtb->inner_v[a]);
|
2009-06-08 12:39:39 +00:00
|
|
|
}
|
2012-03-30 01:51:25 +00:00
|
|
|
copy_v2_v2(quad_strip[a * 2], wtb->outer_v[0]);
|
|
|
|
copy_v2_v2(quad_strip[a * 2 + 1], wtb->inner_v[0]);
|
2011-09-09 14:44:36 +00:00
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static void widget_verts_to_quad_strip_open(uiWidgetBase *wtb, const int totvert, float quad_strip[WIDGET_SIZE_MAX * 2][2])
|
2011-09-09 14:44:36 +00:00
|
|
|
{
|
|
|
|
int a;
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < totvert; a++) {
|
|
|
|
quad_strip[a * 2][0] = wtb->outer_v[a][0];
|
|
|
|
quad_strip[a * 2][1] = wtb->outer_v[a][1];
|
2013-02-10 18:03:01 +00:00
|
|
|
quad_strip[a * 2 + 1][0] = wtb->outer_v[a][0];
|
|
|
|
quad_strip[a * 2 + 1][1] = wtb->outer_v[a][1] - 1.0f;
|
2011-09-09 14:44:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void widgetbase_outline(uiWidgetBase *wtb)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
float quad_strip[WIDGET_SIZE_MAX * 2 + 2][2]; /* + 2 because the last pair is wrapped */
|
2011-09-09 14:44:36 +00:00
|
|
|
widget_verts_to_quad_strip(wtb, wtb->totvert, quad_strip);
|
|
|
|
|
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, quad_strip);
|
2012-03-30 01:51:25 +00:00
|
|
|
glDrawArrays(GL_QUAD_STRIP, 0, wtb->totvert * 2 + 2);
|
2011-09-09 14:44:36 +00:00
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
2009-06-08 12:39:39 +00:00
|
|
|
}
|
|
|
|
|
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 */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wtb->inner) {
|
2012-03-30 01:51:25 +00:00
|
|
|
if (wcol->shaded == 0) {
|
2010-06-26 17:12:55 +00:00
|
|
|
if (wcol->alpha_check) {
|
2011-09-09 14:44:36 +00:00
|
|
|
float inner_v_half[WIDGET_SIZE_MAX][2];
|
2012-03-30 01:51:25 +00:00
|
|
|
float x_mid = 0.0f; /* used for dumb clamping of values */
|
2010-06-26 17:12:55 +00:00
|
|
|
|
|
|
|
/* dark checkers */
|
2013-12-24 17:20:37 +11:00
|
|
|
glColor4ub(UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, UI_ALPHA_CHECKER_DARK, 255);
|
2011-09-09 14:44:36 +00:00
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
|
|
|
|
glDrawArrays(GL_POLYGON, 0, wtb->totvert);
|
2009-06-08 10:00:14 +00:00
|
|
|
|
2010-06-26 17:12:55 +00:00
|
|
|
/* light checkers */
|
|
|
|
glEnable(GL_POLYGON_STIPPLE);
|
2013-12-24 17:20:37 +11:00
|
|
|
glColor4ub(UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, UI_ALPHA_CHECKER_LIGHT, 255);
|
|
|
|
glPolygonStipple(stipple_checker_8px);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
|
|
|
|
glDrawArrays(GL_POLYGON, 0, wtb->totvert);
|
|
|
|
|
2010-06-26 17:12:55 +00:00
|
|
|
glDisable(GL_POLYGON_STIPPLE);
|
|
|
|
|
|
|
|
/* alpha fill */
|
|
|
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
glColor4ubv((unsigned char *)wcol->inner);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < wtb->totvert; a++) {
|
2010-06-26 17:12:55 +00:00
|
|
|
x_mid += wtb->inner_v[a][0];
|
|
|
|
}
|
|
|
|
x_mid /= wtb->totvert;
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
|
|
|
|
glDrawArrays(GL_POLYGON, 0, wtb->totvert);
|
2010-06-26 17:12:55 +00:00
|
|
|
|
|
|
|
/* 1/2 solid color */
|
|
|
|
glColor4ub(wcol->inner[0], wcol->inner[1], wcol->inner[2], 255);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < wtb->totvert; a++) {
|
|
|
|
inner_v_half[a][0] = MIN2(wtb->inner_v[a][0], x_mid);
|
|
|
|
inner_v_half[a][1] = wtb->inner_v[a][1];
|
2011-09-09 14:44:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, inner_v_half);
|
|
|
|
glDrawArrays(GL_POLYGON, 0, wtb->totvert);
|
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
2010-06-26 17:12:55 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* simple fill */
|
2012-03-30 01:51:25 +00:00
|
|
|
glColor4ubv((unsigned char *)wcol->inner);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
|
|
|
|
glDrawArrays(GL_POLYGON, 0, wtb->totvert);
|
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
2010-06-26 17:12:55 +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];
|
2011-09-09 14:44:36 +00:00
|
|
|
unsigned char col_array[WIDGET_SIZE_MAX * 4];
|
2012-03-30 01:51:25 +00:00
|
|
|
unsigned char *col_pt = col_array;
|
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);
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < wtb->totvert; a++, col_pt += 4) {
|
2011-09-09 14:44:36 +00:00
|
|
|
round_box_shade_col4_r(col_pt, col1, col2, wtb->inner_uv[a][wtb->shadedir]);
|
2009-04-02 18:16:15 +00:00
|
|
|
}
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glEnableClientState(GL_COLOR_ARRAY);
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
|
|
|
|
glColorPointer(4, GL_UNSIGNED_BYTE, 0, col_array);
|
|
|
|
glDrawArrays(GL_POLYGON, 0, wtb->totvert);
|
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glDisableClientState(GL_COLOR_ARRAY);
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
glShadeModel(GL_FLAT);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* for each AA step */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wtb->outline) {
|
2012-03-30 01:51:25 +00:00
|
|
|
float quad_strip[WIDGET_SIZE_MAX * 2 + 2][2]; /* + 2 because the last pair is wrapped */
|
|
|
|
float quad_strip_emboss[WIDGET_SIZE_MAX * 2][2]; /* only for emboss */
|
2011-09-09 14:44:36 +00:00
|
|
|
|
2012-01-14 07:46:21 +00:00
|
|
|
const unsigned char tcol[4] = {wcol->outline[0],
|
|
|
|
wcol->outline[1],
|
|
|
|
wcol->outline[2],
|
2013-03-18 18:29:22 +00:00
|
|
|
wcol->outline[3] / WIDGET_AA_JITTER};
|
2012-01-13 09:26:06 +00:00
|
|
|
|
2011-09-09 14:44:36 +00:00
|
|
|
widget_verts_to_quad_strip(wtb, wtb->totvert, quad_strip);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wtb->emboss) {
|
2011-09-09 14:44:36 +00:00
|
|
|
widget_verts_to_quad_strip_open(wtb, wtb->halfwayvert, quad_strip_emboss);
|
|
|
|
}
|
|
|
|
|
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
|
2012-01-13 09:26:06 +00:00
|
|
|
for (j = 0; j < WIDGET_AA_JITTER; j++) {
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(jit[j][0], jit[j][1], 0.0f);
|
2009-04-02 18:16:15 +00:00
|
|
|
|
|
|
|
/* outline */
|
2012-01-13 09:26:06 +00:00
|
|
|
glColor4ubv(tcol);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, quad_strip);
|
2012-03-30 01:51:25 +00:00
|
|
|
glDrawArrays(GL_QUAD_STRIP, 0, wtb->totvert * 2 + 2);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
/* emboss bottom shadow */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wtb->emboss) {
|
2009-04-03 16:26:03 +00:00
|
|
|
glColor4f(1.0f, 1.0f, 1.0f, 0.02f);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, quad_strip_emboss);
|
2012-03-30 01:51:25 +00:00
|
|
|
glDrawArrays(GL_QUAD_STRIP, 0, wtb->halfwayvert * 2);
|
2009-04-02 18:16:15 +00:00
|
|
|
}
|
|
|
|
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* decoration */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wtb->tria1.tot || wtb->tria2.tot) {
|
2012-01-14 07:46:21 +00:00
|
|
|
const unsigned char tcol[4] = {wcol->item[0],
|
|
|
|
wcol->item[1],
|
|
|
|
wcol->item[2],
|
|
|
|
(unsigned char)((float)wcol->item[3] / WIDGET_AA_JITTER)};
|
2009-03-25 16:58:42 +00:00
|
|
|
/* for each AA step */
|
2012-01-13 09:26:06 +00:00
|
|
|
for (j = 0; j < WIDGET_AA_JITTER; j++) {
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(jit[j][0], jit[j][1], 0.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wtb->tria1.tot) {
|
2012-01-13 09:26:06 +00:00
|
|
|
glColor4ubv(tcol);
|
2009-04-02 18:16:15 +00:00
|
|
|
widget_trias_draw(&wtb->tria1);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wtb->tria2.tot) {
|
2012-01-13 09:26:06 +00:00
|
|
|
glColor4ubv(tcol);
|
2009-04-02 18:16:15 +00:00
|
|
|
widget_trias_draw(&wtb->tria2);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2013-07-19 10:40:01 +00:00
|
|
|
glTranslatef(-jit[j][0], -jit[j][1], 0.0f);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* *********************** text/icon ************************************** */
|
|
|
|
|
2014-01-04 14:47:20 +01:00
|
|
|
#define UI_TEXT_CLIP_MARGIN (0.25f * U.widget_unit / but->block->aspect)
|
2013-12-18 17:11:38 +11:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
#define PREVIEW_PAD 4
|
2010-01-03 08:37:18 +00:00
|
|
|
|
2012-12-13 02:40:49 +00:00
|
|
|
static void widget_draw_preview(BIFIconID icon, float UNUSED(alpha), const rcti *rect)
|
2010-01-03 08:37:18 +00:00
|
|
|
{
|
2011-01-07 04:10:37 +00:00
|
|
|
int w, h, size;
|
2010-07-26 04:00:09 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (icon == ICON_NONE)
|
2010-07-26 18:37:47 +00:00
|
|
|
return;
|
|
|
|
|
2012-09-15 11:48:20 +00:00
|
|
|
w = BLI_rcti_size_x(rect);
|
|
|
|
h = BLI_rcti_size_y(rect);
|
2010-01-03 08:37:18 +00:00
|
|
|
size = MIN2(w, h);
|
2012-03-30 01:51:25 +00:00
|
|
|
size -= PREVIEW_PAD * 2; /* padding */
|
2011-01-07 04:10:37 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (size > 0) {
|
2012-03-30 01:51:25 +00:00
|
|
|
int x = rect->xmin + w / 2 - size / 2;
|
|
|
|
int y = rect->ymin + h / 2 - size / 2;
|
2011-01-07 04:10:37 +00:00
|
|
|
|
2011-01-20 16:29:43 +00:00
|
|
|
UI_icon_draw_preview_aspect_size(x, y, icon, 1.0f, size);
|
2011-01-07 04:10:37 +00:00
|
|
|
}
|
2010-01-03 08:37:18 +00:00
|
|
|
}
|
|
|
|
|
2009-04-07 17:08:26 +00:00
|
|
|
|
2013-12-18 17:11:38 +11:00
|
|
|
static int ui_but_draw_menu_icon(const uiBut *but)
|
2011-11-14 14:42:47 +00:00
|
|
|
{
|
|
|
|
return (but->flag & UI_ICON_SUBMENU) && (but->dt == UI_EMBOSSP);
|
|
|
|
}
|
|
|
|
|
2009-04-07 17:08:26 +00:00
|
|
|
/* icons have been standardized... and this call draws in untransformed coordinates */
|
|
|
|
|
2014-01-10 02:23:55 +11:00
|
|
|
static void widget_draw_icon(const uiBut *but, BIFIconID icon, float alpha, const rcti *rect,
|
|
|
|
const bool show_menu_icon)
|
2009-04-07 17:08:26 +00:00
|
|
|
{
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float xs = 0.0f, ys = 0.0f;
|
2009-06-04 15:19:48 +00:00
|
|
|
float aspect, height;
|
2009-04-07 17:08:26 +00:00
|
|
|
|
2010-01-03 08:37:18 +00:00
|
|
|
if (but->flag & UI_ICON_PREVIEW) {
|
2011-01-20 16:29:43 +00:00
|
|
|
widget_draw_preview(icon, alpha, rect);
|
2010-01-03 08:37:18 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-04-07 17:08:26 +00:00
|
|
|
/* this icon doesn't need draw... */
|
2012-03-30 01:51:25 +00:00
|
|
|
if (icon == ICON_BLANK1 && (but->flag & UI_ICON_SUBMENU) == 0) return;
|
2009-04-07 17:08:26 +00:00
|
|
|
|
2012-12-18 19:35:54 +00:00
|
|
|
aspect = but->block->aspect / UI_DPI_FAC;
|
|
|
|
height = ICON_DEFAULT_HEIGHT / aspect;
|
2012-12-19 11:55:41 +00:00
|
|
|
|
2009-04-30 17:27:30 +00:00
|
|
|
/* calculate blend color */
|
2012-03-25 22:35:18 +00:00
|
|
|
if (ELEM4(but->type, TOG, ROW, TOGN, LISTROW)) {
|
2012-10-07 09:48:59 +00:00
|
|
|
if (but->flag & UI_SELECT) {}
|
|
|
|
else if (but->flag & UI_ACTIVE) {}
|
2012-03-30 01:51:25 +00:00
|
|
|
else alpha = 0.5f;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
/* extra feature allows more alpha blending */
|
2013-11-21 16:51:29 +01:00
|
|
|
if ((but->type == LABEL) && but->a1 == 1.0f)
|
Fix [#35750] list items in properties editor (text colors not following list item theme).
Issue goes back since we stopped using LISTROW button to draw item's name (i.e. since we have custom buttons in list items!).
This commit:
* Adds a new flag to uiBlock, UI_BLOCK_LIST_ITEM, to mark blocks used for each list item.
* Adds a new button type, LISTLABEL, which basically behaves exactly as LABEL, but uses wcol_list_item color set.
* When uiItemL is called, it checks whether current block has UI_BLOCK_LIST_ITEM set, and if so, switch produced button to LISTLABEL type.
* Adds a new helper func, ui_layout_list_set_labels_active, called after the active list item has been "drawn", to set all LISTLABEL buttons as UI_SELECT.
Note custom widget_state_label() was removed, in interface_widgets.c, as it did nothing more than default widget_state().
Thanks to Brecht for the review and advices.
2013-06-26 07:28:55 +00:00
|
|
|
alpha *= but->a2;
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
|
2009-04-30 17:27:30 +00:00
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (icon && icon != ICON_BLANK1) {
|
2012-12-18 19:35:54 +00:00
|
|
|
float ofs = 1.0f / aspect;
|
|
|
|
|
2013-11-21 14:43:08 +01:00
|
|
|
if (but->drawflag & UI_BUT_ICON_LEFT) {
|
2013-06-09 18:05:50 +00:00
|
|
|
if (but->block->flag & UI_BLOCK_LOOP) {
|
2013-01-09 15:58:34 +00:00
|
|
|
if (ELEM(but->type, SEARCH_MENU, SEARCH_MENU_UNLINK))
|
2012-12-18 19:35:54 +00:00
|
|
|
xs = rect->xmin + 4.0f * ofs;
|
2009-06-05 16:11:18 +00:00
|
|
|
else
|
2012-12-18 19:35:54 +00:00
|
|
|
xs = rect->xmin + ofs;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-12-18 19:35:54 +00:00
|
|
|
xs = rect->xmin + 4.0f * ofs;
|
2009-04-30 17:27:30 +00:00
|
|
|
}
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
ys = (rect->ymin + rect->ymax - height) / 2.0f;
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
|
|
|
else {
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
xs = (rect->xmin + rect->xmax - height) / 2.0f;
|
|
|
|
ys = (rect->ymin + rect->ymax - height) / 2.0f;
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
|
2012-12-19 11:55:41 +00:00
|
|
|
/* force positions to integers, for zoom levels near 1. draws icons crisp. */
|
|
|
|
if (aspect > 0.95f && aspect < 1.05f) {
|
|
|
|
xs = (int)(xs + 0.1f);
|
|
|
|
ys = (int)(ys + 0.1f);
|
|
|
|
}
|
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
/* to indicate draggable */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->dragpoin && (but->flag & UI_ACTIVE)) {
|
2012-03-30 01:51:25 +00:00
|
|
|
float rgb[3] = {1.25f, 1.25f, 1.25f};
|
2012-12-18 19:35:54 +00:00
|
|
|
UI_icon_draw_aspect_color(xs, ys, icon, aspect, rgb);
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
}
|
|
|
|
else
|
2012-12-18 19:35:54 +00:00
|
|
|
UI_icon_draw_aspect(xs, ys, icon, aspect, alpha);
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
2011-11-14 14:42:47 +00:00
|
|
|
|
2014-01-10 02:23:55 +11:00
|
|
|
if (show_menu_icon) {
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
xs = rect->xmax - UI_DPI_ICON_SIZE - aspect;
|
|
|
|
ys = (rect->ymin + rect->ymax - height) / 2.0f;
|
2009-04-30 17:27:30 +00:00
|
|
|
|
2012-12-18 19:35:54 +00:00
|
|
|
UI_icon_draw_aspect(xs, ys, ICON_RIGHTARROW_THIN, aspect, alpha);
|
2009-04-07 17:08:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
2012-03-22 09:20:22 +00:00
|
|
|
static void ui_text_clip_give_prev_off(uiBut *but)
|
|
|
|
{
|
|
|
|
char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, but->drawstr + but->ofs);
|
|
|
|
int bytes = but->drawstr + but->ofs - prev_utf8;
|
|
|
|
|
|
|
|
but->ofs -= bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ui_text_clip_give_next_off(uiBut *but)
|
|
|
|
{
|
|
|
|
char *next_utf8 = BLI_str_find_next_char_utf8(but->drawstr + but->ofs, NULL);
|
|
|
|
int bytes = next_utf8 - (but->drawstr + but->ofs);
|
|
|
|
|
|
|
|
but->ofs += bytes;
|
|
|
|
}
|
|
|
|
|
2012-09-17 00:33:07 +00:00
|
|
|
/**
|
|
|
|
* Cut off the start of the text to fit into the width of \a rect
|
|
|
|
*
|
|
|
|
* \note Sets but->ofs to make sure text is correctly visible.
|
|
|
|
* \note Clips right in some cases, this function could be cleaned up.
|
|
|
|
*/
|
2012-12-13 02:40:49 +00:00
|
|
|
static void ui_text_clip_left(uiFontStyle *fstyle, uiBut *but, const rcti *rect)
|
2009-04-10 14:06:24 +00:00
|
|
|
{
|
2014-01-04 14:47:20 +01:00
|
|
|
/* We are not supposed to use labels with that clipping, so we can always apply margins. */
|
|
|
|
const int border = (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
|
2013-12-18 17:11:38 +11:00
|
|
|
const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
|
2012-09-17 00:33:07 +00:00
|
|
|
|
2009-04-10 14:06:24 +00:00
|
|
|
/* need to set this first */
|
|
|
|
uiStyleFontSet(fstyle);
|
2010-04-02 11:15:37 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (fstyle->kerning == 1) /* for BLF_width */
|
BugFix:
[#20854] PROPERTIES STAMP: Rendering stamp flickers in output renders
Blenfont was not thread safe, that is why one thread can change
the font properties (size, dpi, color, etc) at the same time
that the stamp draw on the image, and then the problem.
To make blenfont thread safe I have to change two important things:
1) Every BLF_* function take one argument, the font id.
2) We have two new function to make font "thread safe":
BLF_load_unique
BLF_load_mem_unique
This two function are for case like stamp, that need and own font
that don't share the glyph cache, so can draw without problem
in a different thread.
Why the BLF_*_unique function ?
Because blenfont keep only one copy of a font and keep a list of
"glyph cache". Every glyph cache have size and dpi, so if two
different thread access the same font at the same time, they can
change value and finish with something like the stamp problem.
Why don't remove the glyph cache ?
Because if we do that, we finish with a font object for every size
and dpi, and the stamp is really a special case that happen in
the rendering process, so I really thing is better keep the
glyph cache and make this two new function to handle this
special case.
(When I say "font object" I mean have the same freetype font multiple
times just to have differents size and dpi)
As Matt point we still can have one case that two thread access
the BLF_*_unique function at the same time, but I am looking to
fix this with some class of thread lock.
For now I test and work fine, so if some one found problem, please
let me know.
Campbell I have to change the python api (python/generic/blf_api.c)
to the new syntax, so maybe you can take a look at this.
2010-04-22 10:56:45 +00:00
|
|
|
BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
2009-04-07 17:08:26 +00:00
|
|
|
|
2012-09-17 00:57:33 +00:00
|
|
|
but->ofs = 0;
|
2013-12-02 20:33:45 +11:00
|
|
|
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr, sizeof(but->drawstr));
|
2012-01-26 12:48:36 +00:00
|
|
|
|
2013-12-16 21:59:47 +11:00
|
|
|
if (but->strwidth > okwidth) {
|
|
|
|
float strwidth;
|
|
|
|
but->ofs = BLF_width_to_rstrlen(fstyle->uifont_id, but->drawstr,
|
|
|
|
sizeof(but->drawstr), okwidth, &strwidth);
|
|
|
|
but->strwidth = strwidth;
|
2012-09-17 00:33:07 +00:00
|
|
|
}
|
2012-09-17 00:57:33 +00:00
|
|
|
|
|
|
|
if (fstyle->kerning == 1) {
|
|
|
|
BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 15:02:35 +01:00
|
|
|
/* Helper.
|
|
|
|
* This func assumes things like kerning handling have already been handled!
|
|
|
|
* Return the length of modified (right-clipped + ellipsis) string.
|
|
|
|
*/
|
|
|
|
static void ui_text_clip_right_ex(uiFontStyle *fstyle, uiBut *but, const size_t max_len, const float okwidth,
|
|
|
|
const char *sep, const int sep_len, const float sep_strwidth)
|
|
|
|
{
|
|
|
|
float tmp;
|
|
|
|
int l_end;
|
|
|
|
|
|
|
|
/* If the trailing ellipsis takes more than 20% of all available width, just cut the string
|
|
|
|
* (as using the ellipsis would remove even more useful chars, and we cannot show much already!).
|
|
|
|
*/
|
|
|
|
if (sep_strwidth / okwidth > 0.2f) {
|
|
|
|
l_end = BLF_width_to_strlen(fstyle->uifont_id, but->drawstr, max_len, okwidth, &tmp);
|
|
|
|
but->drawstr[l_end] = '\0';
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
l_end = BLF_width_to_strlen(fstyle->uifont_id, but->drawstr, max_len, okwidth - sep_strwidth, &tmp);
|
|
|
|
memcpy(but->drawstr + l_end, sep, sep_len + 1); /* +1 for trailing '\0'. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
/**
|
2014-01-06 15:02:35 +01:00
|
|
|
* Cut off the middle of the text to fit into the width of \a rect.
|
|
|
|
* Note in case this middle clipping would just remove a few chars, it rather clips right, which is more readable.
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
*/
|
|
|
|
static void ui_text_clip_middle(uiFontStyle *fstyle, uiBut *but, const rcti *rect)
|
|
|
|
{
|
2014-01-04 14:47:20 +01:00
|
|
|
/* No margin for labels! */
|
2014-01-04 16:50:42 +01:00
|
|
|
const int border = ELEM(but->type, LABEL, MENU) ? 0 : (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
|
|
|
|
float strwidth;
|
2014-01-06 15:02:35 +01:00
|
|
|
const size_t max_len = sizeof(but->drawstr);
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
|
|
|
|
/* need to set this first */
|
|
|
|
uiStyleFontSet(fstyle);
|
|
|
|
|
|
|
|
if (fstyle->kerning == 1) /* for BLF_width */
|
|
|
|
BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
|
|
|
|
but->ofs = 0;
|
2014-01-06 15:02:35 +01:00
|
|
|
strwidth = BLF_width(fstyle->uifont_id, but->drawstr, max_len);
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
|
|
|
|
if (strwidth > okwidth) {
|
2014-01-06 15:02:35 +01:00
|
|
|
const char sep[] = "…";
|
2014-01-03 19:31:52 +11:00
|
|
|
const int sep_len = sizeof(sep) - 1;
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
size_t l_end;
|
|
|
|
|
2014-01-03 19:31:52 +11:00
|
|
|
const float sep_strwidth = BLF_width(fstyle->uifont_id, sep, sep_len + 1);
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
const float parts_strwidth = ((float)okwidth - sep_strwidth) / 2.0f;
|
|
|
|
|
2014-01-06 15:02:35 +01:00
|
|
|
if (min_ff(parts_strwidth, strwidth - okwidth) < (float)(UI_DPI_ICON_SIZE) / but->block->aspect * 2.0f) {
|
2014-01-04 16:50:42 +01:00
|
|
|
/* If we really have no place, or we would clip a very small piece of string in the middle,
|
|
|
|
* only show start of string.
|
|
|
|
*/
|
2014-01-06 15:02:35 +01:00
|
|
|
ui_text_clip_right_ex(fstyle, but, max_len, (float)okwidth, sep, sep_len, sep_strwidth);
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
size_t r_offset, r_len;
|
|
|
|
|
|
|
|
l_end = BLF_width_to_strlen(fstyle->uifont_id, but->drawstr, max_len, parts_strwidth, &strwidth);
|
|
|
|
r_offset = BLF_width_to_rstrlen(fstyle->uifont_id, but->drawstr, max_len, parts_strwidth, &strwidth);
|
|
|
|
r_len = strlen(but->drawstr + r_offset) + 1; /* +1 for the trailing '\0'... */
|
|
|
|
|
|
|
|
if (l_end + sep_len + r_len > max_len) {
|
|
|
|
/* Corner case, the str already takes all available mem, and the ellipsis chars would actually
|
|
|
|
* add more chars...
|
|
|
|
* Better to just trim one or two letters to the right in this case...
|
2014-01-06 15:02:35 +01:00
|
|
|
* Note: with a single-char ellipsis, this should never happen! But better be safe here...
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
*/
|
2014-01-06 15:02:35 +01:00
|
|
|
ui_text_clip_right_ex(fstyle, but, max_len, (float)okwidth, sep, sep_len, sep_strwidth);
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
memmove(but->drawstr + l_end + sep_len, but->drawstr + r_offset, r_len);
|
|
|
|
memcpy(but->drawstr + l_end, sep, sep_len);
|
|
|
|
}
|
|
|
|
}
|
2014-01-06 15:02:35 +01:00
|
|
|
strwidth = BLF_width(fstyle->uifont_id, but->drawstr, max_len);
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
but->strwidth = strwidth;
|
|
|
|
|
|
|
|
if (fstyle->kerning == 1) {
|
|
|
|
BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-17 00:57:33 +00:00
|
|
|
/**
|
|
|
|
* Cut off the text, taking into account the cursor location (text display while editing).
|
|
|
|
*/
|
2012-12-13 02:40:49 +00:00
|
|
|
static void ui_text_clip_cursor(uiFontStyle *fstyle, uiBut *but, const rcti *rect)
|
2012-09-17 00:57:33 +00:00
|
|
|
{
|
2014-01-04 14:47:20 +01:00
|
|
|
const int border = (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
|
2013-12-18 17:11:38 +11:00
|
|
|
const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
|
2012-09-17 00:57:33 +00:00
|
|
|
|
|
|
|
BLI_assert(but->editstr && but->pos >= 0);
|
|
|
|
|
|
|
|
/* need to set this first */
|
|
|
|
uiStyleFontSet(fstyle);
|
|
|
|
|
|
|
|
if (fstyle->kerning == 1) /* for BLF_width */
|
|
|
|
BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
|
2012-09-28 11:28:23 +00:00
|
|
|
/* define ofs dynamically */
|
|
|
|
if (but->ofs > but->pos)
|
|
|
|
but->ofs = but->pos;
|
|
|
|
|
2013-12-02 20:33:45 +11:00
|
|
|
if (BLF_width(fstyle->uifont_id, but->drawstr, sizeof(but->drawstr)) <= okwidth)
|
2012-09-17 00:33:07 +00:00
|
|
|
but->ofs = 0;
|
2011-01-20 18:34:48 +00:00
|
|
|
|
2013-12-02 20:33:45 +11:00
|
|
|
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
|
2012-09-17 00:57:33 +00:00
|
|
|
|
2012-09-28 11:28:23 +00:00
|
|
|
while (but->strwidth > okwidth) {
|
|
|
|
float width;
|
|
|
|
|
|
|
|
/* string position of cursor */
|
2013-12-02 21:35:42 +11:00
|
|
|
width = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, but->pos - but->ofs);
|
2012-09-28 11:28:23 +00:00
|
|
|
|
|
|
|
/* if cursor is at 20 pixels of right side button we clip left */
|
|
|
|
if (width > okwidth - 20) {
|
|
|
|
ui_text_clip_give_next_off(but);
|
2012-09-17 00:57:33 +00:00
|
|
|
}
|
2012-09-28 11:28:23 +00:00
|
|
|
else {
|
|
|
|
int len, bytes;
|
|
|
|
/* shift string to the left */
|
|
|
|
if (width < 20 && but->ofs > 0)
|
|
|
|
ui_text_clip_give_prev_off(but);
|
|
|
|
len = strlen(but->drawstr);
|
|
|
|
bytes = BLI_str_utf8_size(BLI_str_find_prev_char_utf8(but->drawstr, but->drawstr + len));
|
2012-11-09 03:36:38 +00:00
|
|
|
if (bytes < 0)
|
|
|
|
bytes = 1;
|
2012-09-28 11:28:23 +00:00
|
|
|
but->drawstr[len - bytes] = 0;
|
|
|
|
}
|
|
|
|
|
2013-12-02 20:33:45 +11:00
|
|
|
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
|
2012-09-28 11:28:23 +00:00
|
|
|
|
|
|
|
if (but->strwidth < 10) break;
|
2009-04-10 14:06:24 +00:00
|
|
|
}
|
2012-09-17 00:33:07 +00:00
|
|
|
|
|
|
|
if (fstyle->kerning == 1) {
|
BugFix:
[#20854] PROPERTIES STAMP: Rendering stamp flickers in output renders
Blenfont was not thread safe, that is why one thread can change
the font properties (size, dpi, color, etc) at the same time
that the stamp draw on the image, and then the problem.
To make blenfont thread safe I have to change two important things:
1) Every BLF_* function take one argument, the font id.
2) We have two new function to make font "thread safe":
BLF_load_unique
BLF_load_mem_unique
This two function are for case like stamp, that need and own font
that don't share the glyph cache, so can draw without problem
in a different thread.
Why the BLF_*_unique function ?
Because blenfont keep only one copy of a font and keep a list of
"glyph cache". Every glyph cache have size and dpi, so if two
different thread access the same font at the same time, they can
change value and finish with something like the stamp problem.
Why don't remove the glyph cache ?
Because if we do that, we finish with a font object for every size
and dpi, and the stamp is really a special case that happen in
the rendering process, so I really thing is better keep the
glyph cache and make this two new function to handle this
special case.
(When I say "font object" I mean have the same freetype font multiple
times just to have differents size and dpi)
As Matt point we still can have one case that two thread access
the BLF_*_unique function at the same time, but I am looking to
fix this with some class of thread lock.
For now I test and work fine, so if some one found problem, please
let me know.
Campbell I have to change the python api (python/generic/blf_api.c)
to the new syntax, so maybe you can take a look at this.
2010-04-22 10:56:45 +00:00
|
|
|
BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
2012-09-17 00:33:07 +00:00
|
|
|
}
|
2009-04-10 14:06:24 +00:00
|
|
|
}
|
2009-04-07 17:08:26 +00:00
|
|
|
|
2012-09-17 00:33:07 +00:00
|
|
|
/**
|
|
|
|
* Cut off the end of text to fit into the width of \a rect.
|
|
|
|
*
|
|
|
|
* \note deals with ': ' especially for number buttons
|
|
|
|
*/
|
2012-12-13 02:40:49 +00:00
|
|
|
static void ui_text_clip_right_label(uiFontStyle *fstyle, uiBut *but, const rcti *rect)
|
2009-11-11 10:27:25 +00:00
|
|
|
{
|
2013-12-18 17:11:38 +11:00
|
|
|
const int border = UI_TEXT_CLIP_MARGIN + 1;
|
2013-12-18 07:15:25 +11:00
|
|
|
const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
|
2012-03-30 01:51:25 +00:00
|
|
|
char *cpoin = NULL;
|
2012-09-17 00:33:07 +00:00
|
|
|
int drawstr_len = strlen(but->drawstr);
|
|
|
|
char *cpend = but->drawstr + drawstr_len;
|
2009-11-11 10:27:25 +00:00
|
|
|
|
|
|
|
/* need to set this first */
|
|
|
|
uiStyleFontSet(fstyle);
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (fstyle->kerning == 1) /* for BLF_width */
|
BugFix:
[#20854] PROPERTIES STAMP: Rendering stamp flickers in output renders
Blenfont was not thread safe, that is why one thread can change
the font properties (size, dpi, color, etc) at the same time
that the stamp draw on the image, and then the problem.
To make blenfont thread safe I have to change two important things:
1) Every BLF_* function take one argument, the font id.
2) We have two new function to make font "thread safe":
BLF_load_unique
BLF_load_mem_unique
This two function are for case like stamp, that need and own font
that don't share the glyph cache, so can draw without problem
in a different thread.
Why the BLF_*_unique function ?
Because blenfont keep only one copy of a font and keep a list of
"glyph cache". Every glyph cache have size and dpi, so if two
different thread access the same font at the same time, they can
change value and finish with something like the stamp problem.
Why don't remove the glyph cache ?
Because if we do that, we finish with a font object for every size
and dpi, and the stamp is really a special case that happen in
the rendering process, so I really thing is better keep the
glyph cache and make this two new function to handle this
special case.
(When I say "font object" I mean have the same freetype font multiple
times just to have differents size and dpi)
As Matt point we still can have one case that two thread access
the BLF_*_unique function at the same time, but I am looking to
fix this with some class of thread lock.
For now I test and work fine, so if some one found problem, please
let me know.
Campbell I have to change the python api (python/generic/blf_api.c)
to the new syntax, so maybe you can take a look at this.
2010-04-22 10:56:45 +00:00
|
|
|
BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
2010-04-02 11:15:37 +00:00
|
|
|
|
2013-12-02 20:33:45 +11:00
|
|
|
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr, sizeof(but->drawstr));
|
2012-03-30 01:51:25 +00:00
|
|
|
but->ofs = 0;
|
2009-11-11 10:27:25 +00:00
|
|
|
|
2012-09-17 00:33:07 +00:00
|
|
|
|
|
|
|
/* First shorten num-buttopns eg,
|
|
|
|
* Translucency: 0.000
|
|
|
|
* becomes
|
|
|
|
* Trans: 0.000
|
|
|
|
*/
|
|
|
|
|
2009-11-11 10:27:25 +00:00
|
|
|
/* find the space after ':' separator */
|
2012-03-30 01:51:25 +00:00
|
|
|
cpoin = strrchr(but->drawstr, ':');
|
2009-11-11 10:27:25 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (cpoin && (cpoin < cpend - 2)) {
|
2009-11-12 00:48:44 +00:00
|
|
|
char *cp2 = cpoin;
|
|
|
|
|
|
|
|
/* chop off the leading text, starting from the right */
|
|
|
|
while (but->strwidth > okwidth && cp2 > but->drawstr) {
|
2012-04-28 09:21:16 +00:00
|
|
|
char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, cp2);
|
|
|
|
int bytes = cp2 - prev_utf8;
|
2012-03-22 09:20:22 +00:00
|
|
|
|
2009-11-12 00:48:44 +00:00
|
|
|
/* shift the text after and including cp2 back by 1 char, +1 to include null terminator */
|
2012-09-17 00:33:07 +00:00
|
|
|
memmove(cp2 - bytes, cp2, drawstr_len + 1);
|
2012-03-30 01:51:25 +00:00
|
|
|
cp2 -= bytes;
|
2012-09-17 00:33:07 +00:00
|
|
|
|
|
|
|
drawstr_len -= bytes;
|
|
|
|
// BLI_assert(strlen(but->drawstr) == drawstr_len);
|
2009-11-12 00:48:44 +00:00
|
|
|
|
2013-12-02 20:33:45 +11:00
|
|
|
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->strwidth < 10) break;
|
2009-11-12 00:48:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* after the leading text is gone, chop off the : and following space, with ofs */
|
2012-04-28 06:31:57 +00:00
|
|
|
while ((but->strwidth > okwidth) && (but->ofs < 2)) {
|
2012-03-22 09:20:22 +00:00
|
|
|
ui_text_clip_give_next_off(but);
|
2013-12-02 20:33:45 +11:00
|
|
|
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
|
2012-03-24 06:38:07 +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
|
|
|
|
2012-09-17 00:33:07 +00:00
|
|
|
|
|
|
|
/* Now just remove trailing chars */
|
2009-11-11 10:27:25 +00:00
|
|
|
/* once the label's gone, chop off the least significant digits */
|
2013-12-16 21:59:47 +11:00
|
|
|
if (but->strwidth > okwidth) {
|
|
|
|
float strwidth;
|
|
|
|
drawstr_len = BLF_width_to_strlen(fstyle->uifont_id, but->drawstr + but->ofs,
|
|
|
|
drawstr_len - but->ofs, okwidth, &strwidth) + but->ofs;
|
|
|
|
but->strwidth = strwidth;
|
2012-09-17 00:33:07 +00:00
|
|
|
but->drawstr[drawstr_len] = 0;
|
2009-11-11 10:27:25 +00:00
|
|
|
}
|
2009-11-12 00:48:44 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (fstyle->kerning == 1)
|
BugFix:
[#20854] PROPERTIES STAMP: Rendering stamp flickers in output renders
Blenfont was not thread safe, that is why one thread can change
the font properties (size, dpi, color, etc) at the same time
that the stamp draw on the image, and then the problem.
To make blenfont thread safe I have to change two important things:
1) Every BLF_* function take one argument, the font id.
2) We have two new function to make font "thread safe":
BLF_load_unique
BLF_load_mem_unique
This two function are for case like stamp, that need and own font
that don't share the glyph cache, so can draw without problem
in a different thread.
Why the BLF_*_unique function ?
Because blenfont keep only one copy of a font and keep a list of
"glyph cache". Every glyph cache have size and dpi, so if two
different thread access the same font at the same time, they can
change value and finish with something like the stamp problem.
Why don't remove the glyph cache ?
Because if we do that, we finish with a font object for every size
and dpi, and the stamp is really a special case that happen in
the rendering process, so I really thing is better keep the
glyph cache and make this two new function to handle this
special case.
(When I say "font object" I mean have the same freetype font multiple
times just to have differents size and dpi)
As Matt point we still can have one case that two thread access
the BLF_*_unique function at the same time, but I am looking to
fix this with some class of thread lock.
For now I test and work fine, so if some one found problem, please
let me know.
Campbell I have to change the python api (python/generic/blf_api.c)
to the new syntax, so maybe you can take a look at this.
2010-04-22 10:56:45 +00:00
|
|
|
BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
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
|
|
|
{
|
2013-12-11 20:33:17 +11:00
|
|
|
int drawstr_left_len = UI_MAX_DRAW_STR;
|
|
|
|
char *drawstr_right = NULL;
|
2013-12-11 21:27:13 +11:00
|
|
|
bool use_right_only = false;
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
uiStyleFontSet(fstyle);
|
|
|
|
|
2013-11-21 14:43:08 +01:00
|
|
|
if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT))
|
2012-03-30 01:51:25 +00:00
|
|
|
fstyle->align = UI_STYLE_TEXT_LEFT;
|
2013-11-21 14:43:08 +01:00
|
|
|
else if (but->drawflag & UI_BUT_TEXT_RIGHT)
|
2013-03-21 12:58:31 +00:00
|
|
|
fstyle->align = UI_STYLE_TEXT_RIGHT;
|
2009-05-21 17:09:06 +00:00
|
|
|
else
|
2012-03-30 01:51:25 +00:00
|
|
|
fstyle->align = UI_STYLE_TEXT_CENTER;
|
2010-04-02 11:15:37 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (fstyle->kerning == 1) /* for BLF_width */
|
BugFix:
[#20854] PROPERTIES STAMP: Rendering stamp flickers in output renders
Blenfont was not thread safe, that is why one thread can change
the font properties (size, dpi, color, etc) at the same time
that the stamp draw on the image, and then the problem.
To make blenfont thread safe I have to change two important things:
1) Every BLF_* function take one argument, the font id.
2) We have two new function to make font "thread safe":
BLF_load_unique
BLF_load_mem_unique
This two function are for case like stamp, that need and own font
that don't share the glyph cache, so can draw without problem
in a different thread.
Why the BLF_*_unique function ?
Because blenfont keep only one copy of a font and keep a list of
"glyph cache". Every glyph cache have size and dpi, so if two
different thread access the same font at the same time, they can
change value and finish with something like the stamp problem.
Why don't remove the glyph cache ?
Because if we do that, we finish with a font object for every size
and dpi, and the stamp is really a special case that happen in
the rendering process, so I really thing is better keep the
glyph cache and make this two new function to handle this
special case.
(When I say "font object" I mean have the same freetype font multiple
times just to have differents size and dpi)
As Matt point we still can have one case that two thread access
the BLF_*_unique function at the same time, but I am looking to
fix this with some class of thread lock.
For now I test and work fine, so if some one found problem, please
let me know.
Campbell I have to change the python api (python/generic/blf_api.c)
to the new syntax, so maybe you can take a look at this.
2010-04-22 10:56:45 +00:00
|
|
|
BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
2010-04-02 11:15:37 +00:00
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
/* text button selection and cursor */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->editstr && but->pos != -1) {
|
2013-12-02 20:33:45 +11:00
|
|
|
short t = 0, pos = 0;
|
2009-05-21 17:09:06 +00:00
|
|
|
short selsta_tmp, selend_tmp, selsta_draw, selwidth_draw;
|
2010-01-12 05:54:15 +00:00
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
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
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (but->drawstr[0] != 0) {
|
2010-01-12 05:54:15 +00:00
|
|
|
|
|
|
|
if (but->selsta >= but->ofs) {
|
2013-12-02 20:33:45 +11:00
|
|
|
selsta_draw = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, selsta_tmp - but->ofs);
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
else {
|
2010-01-12 05:54:15 +00:00
|
|
|
selsta_draw = 0;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
2013-12-02 20:33:45 +11:00
|
|
|
|
|
|
|
selwidth_draw = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, selend_tmp - but->ofs);
|
2009-07-28 17:59:59 +00:00
|
|
|
|
2013-03-18 18:29:22 +00:00
|
|
|
glColor4ubv((unsigned char *)wcol->item);
|
2012-03-30 01:51:25 +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
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-05-21 17:09:06 +00:00
|
|
|
/* text cursor */
|
2012-03-30 01:51:25 +00:00
|
|
|
pos = but->pos;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pos >= but->ofs) {
|
2012-03-30 01:51:25 +00:00
|
|
|
if (but->drawstr[0] != 0) {
|
2013-12-02 20:33:45 +11:00
|
|
|
t = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, pos - but->ofs) / but->aspect;
|
2009-05-21 17:09:06 +00:00
|
|
|
}
|
2009-07-28 17:59:59 +00:00
|
|
|
|
2010-04-02 11:15:37 +00:00
|
|
|
glColor3f(0.20, 0.6, 0.9);
|
2012-03-30 01:51:25 +00:00
|
|
|
glRects(rect->xmin + t, rect->ymin + 2, rect->xmin + t + 2, rect->ymax - 2);
|
2009-05-21 17:09:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-04-02 11:15:37 +00:00
|
|
|
|
|
|
|
if (fstyle->kerning == 1)
|
BugFix:
[#20854] PROPERTIES STAMP: Rendering stamp flickers in output renders
Blenfont was not thread safe, that is why one thread can change
the font properties (size, dpi, color, etc) at the same time
that the stamp draw on the image, and then the problem.
To make blenfont thread safe I have to change two important things:
1) Every BLF_* function take one argument, the font id.
2) We have two new function to make font "thread safe":
BLF_load_unique
BLF_load_mem_unique
This two function are for case like stamp, that need and own font
that don't share the glyph cache, so can draw without problem
in a different thread.
Why the BLF_*_unique function ?
Because blenfont keep only one copy of a font and keep a list of
"glyph cache". Every glyph cache have size and dpi, so if two
different thread access the same font at the same time, they can
change value and finish with something like the stamp problem.
Why don't remove the glyph cache ?
Because if we do that, we finish with a font object for every size
and dpi, and the stamp is really a special case that happen in
the rendering process, so I really thing is better keep the
glyph cache and make this two new function to handle this
special case.
(When I say "font object" I mean have the same freetype font multiple
times just to have differents size and dpi)
As Matt point we still can have one case that two thread access
the BLF_*_unique function at the same time, but I am looking to
fix this with some class of thread lock.
For now I test and work fine, so if some one found problem, please
let me know.
Campbell I have to change the python api (python/generic/blf_api.c)
to the new syntax, so maybe you can take a look at this.
2010-04-22 10:56:45 +00:00
|
|
|
BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
2012-05-22 16:24:09 +00:00
|
|
|
|
|
|
|
#if 0
|
|
|
|
ui_rasterpos_safe(x, y, but->aspect);
|
2013-06-09 18:05:50 +00:00
|
|
|
transopts = ui_translate_buttons();
|
2012-05-22 16:24:09 +00:00
|
|
|
#endif
|
|
|
|
|
2009-05-03 02:27:36 +00:00
|
|
|
/* cut string in 2 parts - only for menu entries */
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((but->block->flag & UI_BLOCK_LOOP)) {
|
2013-06-09 18:05:50 +00:00
|
|
|
if (ELEM3(but->type, NUM, TEX, NUMSLI) == 0) {
|
2013-12-11 20:33:17 +11:00
|
|
|
drawstr_right = strchr(but->drawstr, UI_SEP_CHAR);
|
|
|
|
if (drawstr_right) {
|
|
|
|
drawstr_left_len = (drawstr_right - but->drawstr);
|
|
|
|
drawstr_right++;
|
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2009-05-03 02:27:36 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2013-12-11 21:27:13 +11:00
|
|
|
#ifdef USE_NUMBUTS_LR_ALIGN
|
|
|
|
if (!drawstr_right && ELEM(but->type, NUM, NUMSLI) && (but->editstr == NULL)) {
|
|
|
|
drawstr_right = strchr(but->drawstr + but->ofs, ':');
|
|
|
|
if (drawstr_right) {
|
|
|
|
drawstr_right++;
|
|
|
|
drawstr_left_len = (drawstr_right - but->drawstr);
|
|
|
|
|
|
|
|
while (*drawstr_right == ' ') {
|
|
|
|
drawstr_right++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* no prefix, even so use only cpoin */
|
|
|
|
drawstr_right = but->drawstr + but->ofs;
|
|
|
|
use_right_only = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-03-18 18:29:22 +00:00
|
|
|
glColor4ubv((unsigned char *)wcol->text);
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-11 21:27:13 +11:00
|
|
|
if (!use_right_only) {
|
2013-12-17 13:11:31 +11:00
|
|
|
/* for underline drawing */
|
|
|
|
float font_xofs, font_yofs;
|
|
|
|
|
2013-12-11 21:27:13 +11:00
|
|
|
uiStyleFontDrawExt(fstyle, rect, but->drawstr + but->ofs,
|
|
|
|
drawstr_left_len - but->ofs, &font_xofs, &font_yofs);
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
if (but->menu_key != '\0') {
|
|
|
|
char fixedbuf[128];
|
|
|
|
char *str;
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
BLI_strncpy(fixedbuf, but->drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawstr_left_len));
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
str = strchr(fixedbuf, but->menu_key - 32); /* upper case */
|
|
|
|
if (str == NULL)
|
|
|
|
str = strchr(fixedbuf, but->menu_key);
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
if (str) {
|
|
|
|
int ul_index = -1;
|
|
|
|
float ul_advance;
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
ul_index = (int)(str - fixedbuf);
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
if (fstyle->kerning == 1) {
|
|
|
|
BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
}
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
fixedbuf[ul_index] = '\0';
|
|
|
|
ul_advance = BLF_width(fstyle->uifont_id, fixedbuf, ul_index);
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
BLF_position(fstyle->uifont_id, rect->xmin + font_xofs + ul_advance, rect->ymin + font_yofs, 0.0f);
|
|
|
|
BLF_draw(fstyle->uifont_id, "_", 2);
|
2010-12-14 02:38:29 +00:00
|
|
|
|
2013-12-17 13:11:31 +11:00
|
|
|
if (fstyle->kerning == 1) {
|
|
|
|
BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
}
|
2010-12-14 02:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-04-09 18:11:18 +00:00
|
|
|
|
2009-04-10 14:06:24 +00:00
|
|
|
/* part text right aligned */
|
2013-12-11 20:33:17 +11:00
|
|
|
if (drawstr_right) {
|
2012-03-30 01:51:25 +00:00
|
|
|
fstyle->align = UI_STYLE_TEXT_RIGHT;
|
2013-12-18 17:11:38 +11:00
|
|
|
rect->xmax -= UI_TEXT_CLIP_MARGIN;
|
2013-12-11 20:33:17 +11:00
|
|
|
uiStyleFontDraw(fstyle, rect, drawstr_right);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
{
|
2013-03-18 18:37:59 +00:00
|
|
|
float alpha = (float)wcol->text[3] / 255.0f;
|
* New string property subtype: PASSWORD
When this new subtypes is used, then string of property is hidden using
asterisks, e.g.: mysecretpassword -> ****************
This code was reviewed and modified by Brecht. Thanks very much:
- https://codereview.appspot.com/6713044/
This new subtype of string property is intended mostly for Add-on developers
writing Add-on which communicates with some server (http, sql, ftp, verse,
etc.). When this server requires user authentication and user has to type
username and password, then current API didn't allow to type 'hidden' password,
e.g. when you want to demonstrate this script, then everybody can see this
security password. Some examples of Add-on which could use this new subtype:
- On-line database of textures
- Integration of render farm
- Integration of Verse
Security Notes:
- You can copy paste hiddent string of property from text input using (Ctrl-C, Ctrl-V),
but you can do this in other GUI toolkits too (this behavior it is widely used).
- Text of string property is stored in plain text, but it is widely used in other
GUI toolkits (Qt, Gtk, etc.).
Simple examples:
- https://dl.dropbox.com/u/369894/draw_op_passwd.py
- https://dl.dropbox.com/u/369894/blender-password.png
2012-10-26 12:58:54 +00:00
|
|
|
char password_str[UI_MAX_DRAW_STR];
|
|
|
|
|
|
|
|
if (but == NULL)
|
2012-09-17 00:57:33 +00:00
|
|
|
return;
|
* New string property subtype: PASSWORD
When this new subtypes is used, then string of property is hidden using
asterisks, e.g.: mysecretpassword -> ****************
This code was reviewed and modified by Brecht. Thanks very much:
- https://codereview.appspot.com/6713044/
This new subtype of string property is intended mostly for Add-on developers
writing Add-on which communicates with some server (http, sql, ftp, verse,
etc.). When this server requires user authentication and user has to type
username and password, then current API didn't allow to type 'hidden' password,
e.g. when you want to demonstrate this script, then everybody can see this
security password. Some examples of Add-on which could use this new subtype:
- On-line database of textures
- Integration of render farm
- Integration of Verse
Security Notes:
- You can copy paste hiddent string of property from text input using (Ctrl-C, Ctrl-V),
but you can do this in other GUI toolkits too (this behavior it is widely used).
- Text of string property is stored in plain text, but it is widely used in other
GUI toolkits (Qt, Gtk, etc.).
Simple examples:
- https://dl.dropbox.com/u/369894/draw_op_passwd.py
- https://dl.dropbox.com/u/369894/blender-password.png
2012-10-26 12:58:54 +00:00
|
|
|
|
2014-01-04 17:16:19 +11:00
|
|
|
ui_button_text_password_hide(password_str, but, false);
|
2009-11-11 10:27:25 +00:00
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* check for button text label */
|
2013-06-09 18:05:50 +00:00
|
|
|
if (but->type == MENU && (but->flag & UI_BUT_NODE_LINK)) {
|
2013-12-18 07:15:25 +11:00
|
|
|
rcti temp = *rect;
|
|
|
|
temp.xmin = rect->xmax - BLI_rcti_size_y(rect) - 1;
|
2014-01-10 02:23:55 +11:00
|
|
|
widget_draw_icon(but, ICON_LAYER_USED, alpha, &temp, false);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
2012-09-17 00:57:33 +00:00
|
|
|
|
2013-06-09 18:05:50 +00:00
|
|
|
/* If there's an icon too (made with uiDefIconTextBut) then draw the icon
|
|
|
|
* and offset the text label to accommodate it */
|
2012-09-17 00:57:33 +00:00
|
|
|
|
2013-06-09 18:05:50 +00:00
|
|
|
if (but->flag & UI_HAS_ICON) {
|
2014-01-10 02:23:55 +11:00
|
|
|
const bool show_menu_icon = ui_but_draw_menu_icon(but);
|
|
|
|
const float icon_size = ICON_SIZE_FROM_BUTRECT(rect);
|
|
|
|
|
2014-01-17 00:23:00 +01:00
|
|
|
/* menu item - add some more padding so menus don't feel cramped. it must
|
|
|
|
* be part of the button so that this area is still clickable */
|
2014-01-20 11:13:53 +11:00
|
|
|
if (ui_block_is_menu(but->block))
|
2014-01-17 00:23:00 +01:00
|
|
|
rect->xmin += 0.3f * U.widget_unit;
|
|
|
|
|
2014-01-10 02:23:55 +11:00
|
|
|
widget_draw_icon(but, but->icon + but->iconadd, alpha, rect, show_menu_icon);
|
|
|
|
|
|
|
|
rect->xmin += icon_size;
|
|
|
|
/* without this menu keybindings will overlap the arrow icon [#38083] */
|
|
|
|
if (show_menu_icon) {
|
|
|
|
rect->xmax -= icon_size / 2.0f;
|
|
|
|
}
|
2013-06-09 18:05:50 +00:00
|
|
|
}
|
2013-12-18 07:15:25 +11:00
|
|
|
|
|
|
|
if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) {
|
|
|
|
rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
|
2013-06-09 18:05:50 +00:00
|
|
|
}
|
2013-11-21 14:43:08 +01:00
|
|
|
else if ((but->drawflag & UI_BUT_TEXT_RIGHT)) {
|
2013-06-09 18:05:50 +00:00
|
|
|
rect->xmax -= (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
|
|
|
|
}
|
2013-12-18 17:11:38 +11:00
|
|
|
|
2013-06-09 18:05:50 +00:00
|
|
|
/* unlink icon for this button type */
|
2013-10-15 00:24:53 +00:00
|
|
|
if ((but->type == SEARCH_MENU_UNLINK) && ui_is_but_search_unlink_visible(but)) {
|
2013-06-09 18:05:50 +00:00
|
|
|
rcti temp = *rect;
|
2009-06-02 18:10:06 +00:00
|
|
|
|
2013-06-09 18:05:50 +00:00
|
|
|
temp.xmin = temp.xmax - (BLI_rcti_size_y(rect) * 1.08f);
|
2014-01-10 02:23:55 +11:00
|
|
|
widget_draw_icon(but, ICON_X, alpha, &temp, false);
|
2013-12-18 17:11:38 +11:00
|
|
|
rect->xmax -= ICON_SIZE_FROM_BUTRECT(rect);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
* New string property subtype: PASSWORD
When this new subtypes is used, then string of property is hidden using
asterisks, e.g.: mysecretpassword -> ****************
This code was reviewed and modified by Brecht. Thanks very much:
- https://codereview.appspot.com/6713044/
This new subtype of string property is intended mostly for Add-on developers
writing Add-on which communicates with some server (http, sql, ftp, verse,
etc.). When this server requires user authentication and user has to type
username and password, then current API didn't allow to type 'hidden' password,
e.g. when you want to demonstrate this script, then everybody can see this
security password. Some examples of Add-on which could use this new subtype:
- On-line database of textures
- Integration of render farm
- Integration of Verse
Security Notes:
- You can copy paste hiddent string of property from text input using (Ctrl-C, Ctrl-V),
but you can do this in other GUI toolkits too (this behavior it is widely used).
- Text of string property is stored in plain text, but it is widely used in other
GUI toolkits (Qt, Gtk, etc.).
Simple examples:
- https://dl.dropbox.com/u/369894/draw_op_passwd.py
- https://dl.dropbox.com/u/369894/blender-password.png
2012-10-26 12:58:54 +00:00
|
|
|
|
2013-12-18 07:15:25 +11:00
|
|
|
/* clip but->drawstr to fit in available space */
|
|
|
|
if (but->editstr && but->pos >= 0) {
|
|
|
|
ui_text_clip_cursor(fstyle, but, rect);
|
|
|
|
}
|
|
|
|
else if (ELEM(but->type, NUM, NUMSLI)) {
|
|
|
|
ui_text_clip_right_label(fstyle, but, rect);
|
|
|
|
}
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
#if 0
|
2013-12-19 09:34:53 +01:00
|
|
|
/* Special hack for non-embossed TEX buttons in uiList (we want them to behave as much as possible as labels). */
|
|
|
|
else if ((but->type == TEX) && (but->flag & UI_BUT_LIST_ITEM) && (but->dt & UI_EMBOSSN)) {
|
|
|
|
but->ofs = 0;
|
|
|
|
}
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
#endif
|
2013-12-18 07:15:25 +11:00
|
|
|
else if ((but->block->flag & UI_BLOCK_LOOP) && (but->type == BUT)) {
|
|
|
|
ui_text_clip_left(fstyle, but, rect);
|
|
|
|
}
|
|
|
|
else {
|
Add a new "shortening process" for UI string drawing, which keeps both right and left parts
of the drawstr and replaces the middle by '...'
Rationnal:
It's usually easier to figure out what a troncated string means if you have both its start and end parts.
Details:
It currently affects all UI items (text fields, buttons, labels...).
Only exceptions are buttons inside menus, text fields & co being edited, and numbuttons/sliders.
Note that some static texts (like panels' titles or items in outliner) do not use usual UI items,
and just draw the whole text, using OpenGL to clip it. Will make another patch to fix this.
Reviewers: campbellbarton, brecht, carter2422, #user_interface
Reviewed by: brecht, carter2422
CC: billrey
Differential Revision: https://developer.blender.org/D114
2014-01-01 11:18:27 +01:00
|
|
|
ui_text_clip_middle(fstyle, but, rect);
|
2013-12-18 07:15:25 +11:00
|
|
|
}
|
|
|
|
|
2013-06-09 18:05:50 +00:00
|
|
|
/* always draw text for textbutton cursor */
|
|
|
|
widget_draw_text(fstyle, wcol, but, rect);
|
|
|
|
|
2014-01-04 17:16:19 +11:00
|
|
|
ui_button_text_password_hide(password_str, but, true);
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2013-12-18 17:11:38 +11:00
|
|
|
#undef UI_TEXT_CLIP_MARGIN
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* *********************** widget types ************************************* */
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2012-03-03 16:31:46 +00:00
|
|
|
/* uiWidgetStateColors
|
|
|
|
* 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];
|
|
|
|
* float blend;
|
|
|
|
*/
|
2009-04-13 15:55:27 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetStateColors wcol_state_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
|
|
|
{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
|
|
|
};
|
|
|
|
|
2012-03-03 16:31:46 +00:00
|
|
|
/* uiWidgetColors
|
2013-03-18 18:29:22 +00:00
|
|
|
* char outline[3];
|
|
|
|
* char inner[4];
|
|
|
|
* char inner_sel[4];
|
|
|
|
* char item[3];
|
|
|
|
* char text[3];
|
|
|
|
* char text_sel[3];
|
2012-03-03 16:31:46 +00:00
|
|
|
*
|
|
|
|
* short shaded;
|
|
|
|
* float shadetop, shadedown;
|
|
|
|
*/
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
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
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +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
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +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
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +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 */
|
2012-03-30 01:51:25 +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 */
|
2012-03-30 01:51:25 +00:00
|
|
|
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 */
|
2012-03-30 01:51:25 +00:00
|
|
|
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},
|
2012-03-15 21:11:14 +00:00
|
|
|
{172, 172, 172, 128},
|
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
|
|
|
|
2011-05-03 15:30:16 +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
|
|
|
38, 0
|
2009-04-03 16:26:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* backdrop menu + title text color */
|
2012-03-30 01:51:25 +00:00
|
|
|
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
|
|
|
};
|
|
|
|
|
2012-07-04 12:19:50 +00:00
|
|
|
/* tooltip color */
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetColors wcol_tooltip = {
|
2012-03-19 22:29:16 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{25, 25, 25, 230},
|
|
|
|
{45, 45, 45, 230},
|
|
|
|
{100, 100, 100, 255},
|
|
|
|
|
|
|
|
{160, 160, 160, 255},
|
|
|
|
{255, 255, 255, 255},
|
|
|
|
|
|
|
|
0,
|
|
|
|
25, -20
|
|
|
|
};
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2012-03-30 01:51:25 +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
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +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
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetColors wcol_tool = {
|
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},
|
|
|
|
{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
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetColors wcol_box = {
|
2009-06-01 11:31:06 +00:00
|
|
|
{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
|
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetColors wcol_toggle = {
|
2009-06-24 14:16:56 +00:00
|
|
|
{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
|
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
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
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetColors wcol_progress = {
|
2010-05-27 08:22:16 +00:00
|
|
|
{0, 0, 0, 255},
|
|
|
|
{190, 190, 190, 255},
|
|
|
|
{100, 100, 100, 180},
|
|
|
|
{68, 68, 68, 255},
|
|
|
|
|
|
|
|
{0, 0, 0, 255},
|
|
|
|
{255, 255, 255, 255},
|
|
|
|
|
|
|
|
0,
|
|
|
|
0, 0
|
|
|
|
};
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetColors wcol_list_item = {
|
2009-07-21 01:26:17 +00:00
|
|
|
{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 */
|
2012-03-30 01:51:25 +00:00
|
|
|
static struct uiWidgetColors wcol_tmp = {
|
2009-06-12 14:22:27 +00:00
|
|
|
{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)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
tui->wcol_regular = wcol_regular;
|
|
|
|
tui->wcol_tool = wcol_tool;
|
|
|
|
tui->wcol_text = wcol_text;
|
|
|
|
tui->wcol_radio = wcol_radio;
|
|
|
|
tui->wcol_option = wcol_option;
|
|
|
|
tui->wcol_toggle = wcol_toggle;
|
|
|
|
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;
|
2012-03-19 22:29:16 +00:00
|
|
|
tui->wcol_tooltip = wcol_tooltip;
|
2012-03-30 01:51:25 +00:00
|
|
|
tui->wcol_menu_item = wcol_menu_item;
|
|
|
|
tui->wcol_box = wcol_box;
|
|
|
|
tui->wcol_scroll = wcol_scroll;
|
|
|
|
tui->wcol_list_item = wcol_list_item;
|
|
|
|
tui->wcol_progress = wcol_progress;
|
2009-07-12 02:06:15 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
tui->wcol_state = wcol_state_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
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* ************ button callbacks, state ***************** */
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2011-09-26 17:30:56 +00:00
|
|
|
static void widget_state_blend(char cp[3], const char cpstate[3], const float fac)
|
2009-07-12 02:06:15 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (fac != 0.0f) {
|
2012-03-30 01:51:25 +00:00
|
|
|
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-07-12 02:06:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
uiWidgetStateColors *wcol_state = wt->wcol_state;
|
2009-07-12 02:06:15 +00:00
|
|
|
|
2013-11-23 18:43:23 +01:00
|
|
|
if ((state & UI_BUT_LIST_ITEM) && !(state & UI_TEXTINPUT)) {
|
|
|
|
/* Override default widget's colors. */
|
|
|
|
bTheme *btheme = UI_GetTheme();
|
|
|
|
wt->wcol_theme = &btheme->tui.wcol_list_item;
|
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->wcol = *(wt->wcol_theme);
|
2013-11-23 18:43:23 +01:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT) {
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
|
2009-07-12 02:06:15 +00:00
|
|
|
|
2012-03-24 06:38:07 +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);
|
2012-03-24 06:38:07 +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);
|
2012-03-24 06:38:07 +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
|
|
|
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
|
2010-09-11 00:08:07 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT)
|
2010-09-11 00:08:07 +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 {
|
2012-03-24 06:38:07 +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, wcol_state->blend);
|
2012-03-24 06:38:07 +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);
|
2012-03-24 06:38:07 +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
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_ACTIVE) { /* mouse over? */
|
2012-03-30 01:51:25 +00:00
|
|
|
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;
|
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 23:30:32 +00:00
|
|
|
}
|
2010-09-17 05:58:06 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_BUT_REDALERT) {
|
2012-03-30 01:51:25 +00:00
|
|
|
char red[4] = {255, 0, 0};
|
2010-09-17 05:58:06 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, red, 0.4f);
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_BUT_NODE_ACTIVE) {
|
2012-03-30 01:51:25 +00:00
|
|
|
char blue[4] = {86, 128, 194};
|
2011-11-07 22:28:49 +00:00
|
|
|
widget_state_blend(wt->wcol.inner, blue, 0.3f);
|
|
|
|
}
|
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)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
uiWidgetStateColors *wcol_state = wt->wcol_state;
|
2012-08-19 10:41:27 +00:00
|
|
|
float blend = wcol_state->blend - 0.2f; /* XXX special tweak to make sure that bar will still be visible */
|
2009-10-15 11:52:23 +00:00
|
|
|
|
|
|
|
/* call this for option button */
|
|
|
|
widget_state(wt, state);
|
|
|
|
|
|
|
|
/* now, set the inner-part so that it reflects state settings too */
|
2012-08-19 10:41:27 +00:00
|
|
|
/* TODO: maybe we should have separate settings for the blending colors used for this case? */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT) {
|
2010-09-07 11:14:20 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_BUT_ANIMATED_KEY)
|
2009-10-15 11:52:23 +00:00
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_key_sel, blend);
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (state & UI_BUT_ANIMATED)
|
2009-10-15 11:52:23 +00:00
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_anim_sel, blend);
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (state & UI_BUT_DRIVEN)
|
2009-10-15 11:52:23 +00:00
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_driven_sel, blend);
|
2010-09-11 00:08:07 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT)
|
2010-09-11 00:08:07 +00:00
|
|
|
SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
|
2009-10-15 11:52:23 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_BUT_ANIMATED_KEY)
|
2009-10-15 11:52:23 +00:00
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_key, blend);
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (state & UI_BUT_ANIMATED)
|
2009-10-15 11:52:23 +00:00
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_anim, blend);
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (state & UI_BUT_DRIVEN)
|
2009-10-15 11:52:23 +00:00
|
|
|
widget_state_blend(wt->wcol.item, wcol_state->inner_driven, blend);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-04 15:01:22 +00:00
|
|
|
/* labels use theme colors for text */
|
|
|
|
static void widget_state_option_menu(uiWidgetType *wt, int state)
|
|
|
|
{
|
2013-06-26 20:28:12 +00:00
|
|
|
bTheme *btheme = UI_GetTheme(); /* XXX */
|
2011-04-04 15:01:22 +00:00
|
|
|
|
|
|
|
/* call this for option button */
|
|
|
|
widget_state(wt, state);
|
|
|
|
|
|
|
|
/* if not selected we get theme from menu back */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT)
|
2013-06-26 20:28:12 +00:00
|
|
|
copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text_sel);
|
|
|
|
else
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text);
|
2011-04-04 15:01:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_state_nothing(uiWidgetType *wt, int UNUSED(state))
|
2009-07-02 18:12:46 +00:00
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->wcol = *(wt->wcol_theme);
|
2009-07-02 18:12:46 +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
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* special case, button that calls pulldown */
|
|
|
|
static void widget_state_pulldown(uiWidgetType *wt, int state)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->wcol = *(wt->wcol_theme);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
|
|
|
|
copy_v3_v3_char(wt->wcol.outline, wt->wcol.inner);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_ACTIVE)
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* special case, menu items */
|
|
|
|
static void widget_state_menu_item(uiWidgetType *wt, int state)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->wcol = *(wt->wcol_theme);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2013-01-17 01:48:42 +00:00
|
|
|
/* active and disabled (not so common) */
|
|
|
|
if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
|
|
|
|
widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
|
|
|
|
/* draw the backdrop at low alpha, helps navigating with keys
|
2013-01-17 02:06:54 +00:00
|
|
|
* when disabled items are active */
|
2013-01-17 01:48:42 +00:00
|
|
|
copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
|
|
|
|
wt->wcol.inner[3] = 64;
|
|
|
|
}
|
|
|
|
/* regular disabled */
|
|
|
|
else if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
|
2013-02-18 21:19:43 +00:00
|
|
|
widget_state_blend(wt->wcol.text, wt->wcol.inner, 0.5f);
|
2009-04-12 13:40:29 +00:00
|
|
|
}
|
2013-01-17 01:48:42 +00:00
|
|
|
/* regular active */
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (state & UI_ACTIVE) {
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
|
|
|
|
copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* ************ menu backdrop ************************* */
|
|
|
|
|
|
|
|
/* outside of rect, rad to left/bottom/right */
|
2012-12-20 16:50:39 +00:00
|
|
|
static void widget_softshadow(const rcti *rect, int roundboxalign, const float radin)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
2012-12-20 16:50:39 +00:00
|
|
|
bTheme *btheme = UI_GetTheme();
|
2009-04-03 16:26:03 +00:00
|
|
|
uiWidgetBase wtb;
|
2012-03-30 01:51:25 +00:00
|
|
|
rcti rect1 = *rect;
|
2012-12-20 16:50:39 +00:00
|
|
|
float alphastep;
|
2011-09-09 14:44:36 +00:00
|
|
|
int step, totvert;
|
2012-12-20 16:50:39 +00:00
|
|
|
float quad_strip[WIDGET_SIZE_MAX * 2 + 2][2];
|
|
|
|
const float radout = UI_ThemeMenuShadowWidth();
|
|
|
|
|
|
|
|
/* disabled shadow */
|
|
|
|
if (radout == 0.0f)
|
|
|
|
return;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2009-04-15 14:43:54 +00:00
|
|
|
/* prevent tooltips to not show round shadow */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
if (radout > 0.2f * BLI_rcti_size_y(&rect1))
|
2012-09-15 11:48:20 +00:00
|
|
|
rect1.ymax -= 0.2f * BLI_rcti_size_y(&rect1);
|
2009-04-15 14:43:54 +00:00
|
|
|
else
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect1.ymax -= radout;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
/* inner part */
|
2012-03-30 01:51:25 +00:00
|
|
|
totvert = round_box_shadow_edges(wtb.inner_v, &rect1, radin, roundboxalign & (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT), 0.0f);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
2012-12-20 16:50:39 +00:00
|
|
|
/* we draw a number of increasing size alpha quad strips */
|
|
|
|
alphastep = 3.0f * btheme->tui.menu_shadow_fac / radout;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2011-09-09 14:44:36 +00:00
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
|
2012-12-20 16:50:39 +00:00
|
|
|
for (step = 1; step <= (int)radout; step++) {
|
|
|
|
float expfac = sqrt(step / radout);
|
|
|
|
|
2011-09-11 06:41:09 +00:00
|
|
|
round_box_shadow_edges(wtb.outer_v, &rect1, radin, UI_CNR_ALL, (float)step);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2012-12-20 16:50:39 +00:00
|
|
|
glColor4f(0.0f, 0.0f, 0.0f, alphastep * (1.0f - expfac));
|
2011-09-09 14:44:36 +00:00
|
|
|
|
2012-12-20 16:50:39 +00:00
|
|
|
widget_verts_to_quad_strip(&wtb, totvert, quad_strip);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, quad_strip);
|
2013-03-01 11:42:07 +00:00
|
|
|
glDrawArrays(GL_QUAD_STRIP, 0, totvert * 2); /* add + 2 for getting a complete soft rect. Now it skips top edge to allow transparent menus */
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int direction)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
2012-03-30 01:51:25 +00:00
|
|
|
int roundboxalign = UI_CNR_ALL;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
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) {
|
2012-03-30 01:51:25 +00:00
|
|
|
roundboxalign = (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT);
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect->ymin -= 0.1f * U.widget_unit;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
else if (direction == UI_TOP) {
|
2012-03-30 01:51:25 +00:00
|
|
|
roundboxalign = UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect->ymax += 0.1f * U.widget_unit;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
2012-12-20 16:50:39 +00:00
|
|
|
widget_softshadow(rect, roundboxalign, 0.25f * U.widget_unit);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, 0.25f * U.widget_unit);
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb.emboss = 0;
|
2009-04-03 16:26:03 +00:00
|
|
|
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);
|
2013-02-10 18:03:01 +00:00
|
|
|
glutil_draw_filled_arc(0.0f, M_PI * 2.0, 3.0f * U.pixelsize, 8);
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
2012-03-30 01:51:25 +00:00
|
|
|
glEnable(GL_LINE_SMOOTH);
|
2009-06-12 14:22:27 +00:00
|
|
|
glColor3f(0.0f, 0.0f, 0.0f);
|
2013-02-10 18:03:01 +00:00
|
|
|
glutil_draw_lined_arc(0.0f, M_PI * 2.0, 3.0f * U.pixelsize, 12);
|
2009-06-12 14:22:27 +00:00
|
|
|
glDisable(GL_BLEND);
|
2012-03-30 01:51:25 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
glPopMatrix();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2012-10-04 09:33:14 +00:00
|
|
|
void ui_hsvcircle_vals_from_pos(float *val_rad, float *val_dist, const rcti *rect,
|
|
|
|
const float mx, const float my)
|
2009-06-10 11:43:21 +00:00
|
|
|
{
|
|
|
|
/* duplication of code... well, simple is better now */
|
2012-10-04 09:33:14 +00:00
|
|
|
const float centx = BLI_rcti_cent_x_fl(rect);
|
|
|
|
const float centy = BLI_rcti_cent_y_fl(rect);
|
2012-10-23 13:28:22 +00:00
|
|
|
const float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
|
2012-10-04 09:33:14 +00:00
|
|
|
const float m_delta[2] = {mx - centx, my - centy};
|
|
|
|
const float dist_squared = len_squared_v2(m_delta);
|
|
|
|
|
|
|
|
*val_dist = (dist_squared < (radius * radius)) ? sqrtf(dist_squared) / radius : 1.0f;
|
|
|
|
*val_rad = atan2f(m_delta[0], m_delta[1]) / (2.0f * (float)M_PI) + 0.5f;
|
2009-06-10 11:43:21 +00:00
|
|
|
}
|
|
|
|
|
2013-04-27 12:54:45 +00:00
|
|
|
/* cursor in hsv circle, in float units -1 to 1, to map on radius */
|
|
|
|
void ui_hsvcircle_pos_from_vals(uiBut *but, const rcti *rect, float *hsv, float *xpos, float *ypos)
|
|
|
|
{
|
|
|
|
/* duplication of code... well, simple is better now */
|
|
|
|
const float centx = BLI_rcti_cent_x_fl(rect);
|
|
|
|
const float centy = BLI_rcti_cent_y_fl(rect);
|
|
|
|
float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
|
|
|
|
float ang, radius_t;
|
|
|
|
|
|
|
|
ang = 2.0f * (float)M_PI * hsv[0] + 0.5f * (float)M_PI;
|
|
|
|
|
|
|
|
if (but->flag & UI_BUT_COLOR_CUBIC)
|
|
|
|
radius_t = (1.0f - powf(1.0f - hsv[1], 3.0f));
|
|
|
|
else
|
|
|
|
radius_t = hsv[1];
|
|
|
|
|
|
|
|
radius = CLAMPIS(radius_t, 0.0f, 1.0f) * radius;
|
|
|
|
*xpos = centx + cosf(-ang) * radius;
|
|
|
|
*ypos = centy + sinf(-ang) * radius;
|
|
|
|
}
|
|
|
|
|
2012-10-04 09:43:27 +00:00
|
|
|
static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti *rect)
|
2009-06-10 11:43:21 +00:00
|
|
|
{
|
2013-02-10 18:03:01 +00:00
|
|
|
const int tot = 64;
|
2012-10-04 09:43:27 +00:00
|
|
|
const float radstep = 2.0f * (float)M_PI / (float)tot;
|
|
|
|
const float centx = BLI_rcti_cent_x_fl(rect);
|
|
|
|
const float centy = BLI_rcti_cent_y_fl(rect);
|
2012-10-23 13:28:22 +00:00
|
|
|
float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
|
2012-10-04 09:43:27 +00:00
|
|
|
|
2009-06-10 11:43:21 +00:00
|
|
|
/* gouraud triangle fan */
|
2012-10-04 09:55:10 +00:00
|
|
|
const float *hsv_ptr = ui_block_hsv_get(but->block);
|
2013-04-27 12:54:45 +00:00
|
|
|
float xpos, ypos, ang = 0.0f;
|
2010-10-13 13:53:49 +00:00
|
|
|
float rgb[3], hsvo[3], hsv[3], col[3], colcent[3];
|
2012-10-04 09:43:27 +00:00
|
|
|
int a;
|
2014-01-04 17:16:19 +11:00
|
|
|
bool color_profile = but->block->color_profile;
|
2010-08-25 07:49:12 +00:00
|
|
|
|
|
|
|
if (but->rnaprop && RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA)
|
2014-01-04 17:16:19 +11:00
|
|
|
color_profile = false;
|
2009-06-10 11:43:21 +00:00
|
|
|
|
|
|
|
/* color */
|
2010-01-07 09:55:11 +00:00
|
|
|
ui_get_but_vectorf(but, rgb);
|
2012-10-04 09:55:10 +00:00
|
|
|
|
|
|
|
/* since we use compat functions on both 'hsv' and 'hsvo', they need to be initialized */
|
|
|
|
hsvo[0] = hsv[0] = hsv_ptr[0];
|
|
|
|
hsvo[1] = hsv[1] = hsv_ptr[1];
|
|
|
|
hsvo[2] = hsv[2] = hsv_ptr[2];
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
|
|
|
|
rgb_to_hsv_compat_v(rgb, hsvo);
|
|
|
|
|
|
|
|
if (color_profile)
|
|
|
|
ui_block_to_display_space_v3(but->block, rgb);
|
|
|
|
|
2012-05-26 11:01:01 +00:00
|
|
|
rgb_to_hsv_compat_v(rgb, hsv);
|
2010-01-07 09:55:11 +00:00
|
|
|
|
2010-07-05 07:08:10 +00:00
|
|
|
/* exception: if 'lock' is set
|
2010-01-27 00:22:29 +00:00
|
|
|
* lock the value of the color wheel to 1.
|
2011-10-23 15:43:12 +00:00
|
|
|
* Useful for color correction tools where you're only interested in hue. */
|
2010-08-25 07:49:12 +00:00
|
|
|
if (but->flag & UI_BUT_COLOR_LOCK)
|
|
|
|
hsv[2] = 1.f;
|
2010-01-27 00:22:29 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
hsv_to_rgb(0.f, 0.f, hsv[2], colcent, colcent + 1, colcent + 2);
|
2009-06-10 11:43:21 +00:00
|
|
|
|
|
|
|
glShadeModel(GL_SMOOTH);
|
|
|
|
|
|
|
|
glBegin(GL_TRIANGLE_FAN);
|
|
|
|
glColor3fv(colcent);
|
2012-03-30 01:51:25 +00:00
|
|
|
glVertex2f(centx, centy);
|
2009-06-10 11:43:21 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a <= tot; a++, ang += radstep) {
|
|
|
|
float si = sin(ang);
|
|
|
|
float co = cos(ang);
|
2009-06-10 11:43:21 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
ui_hsvcircle_vals_from_pos(hsv, hsv + 1, rect, centx + co * radius, centy + si * radius);
|
2010-07-04 20:59:10 +00:00
|
|
|
CLAMP(hsv[2], 0.0f, 1.0f); /* for display only */
|
2010-07-05 15:52:25 +00:00
|
|
|
|
2012-05-26 11:01:01 +00:00
|
|
|
hsv_to_rgb_v(hsv, col);
|
2009-06-10 11:43:21 +00:00
|
|
|
glColor3fv(col);
|
2012-03-30 01:51:25 +00:00
|
|
|
glVertex2f(centx + co * radius, centy + si * radius);
|
2009-06-10 11:43:21 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
glShadeModel(GL_FLAT);
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
/* fully rounded outline */
|
|
|
|
glPushMatrix();
|
|
|
|
glTranslatef(centx, centy, 0.0f);
|
|
|
|
glEnable(GL_BLEND);
|
2012-03-30 01:51:25 +00:00
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
glColor3ubv((unsigned char *)wcol->outline);
|
|
|
|
glutil_draw_lined_arc(0.0f, M_PI * 2.0, radius, tot + 1);
|
2009-06-12 14:22:27 +00:00
|
|
|
glDisable(GL_BLEND);
|
2012-03-30 01:51:25 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
2009-06-12 14:22:27 +00:00
|
|
|
glPopMatrix();
|
|
|
|
|
|
|
|
/* cursor */
|
2013-04-27 12:54:45 +00:00
|
|
|
ui_hsvcircle_pos_from_vals(but, rect, hsvo, &xpos, &ypos);
|
2010-07-05 15:52:25 +00:00
|
|
|
|
2013-04-27 12:54:45 +00:00
|
|
|
ui_hsv_cursor(xpos, ypos);
|
2009-06-10 11:43:21 +00:00
|
|
|
}
|
|
|
|
|
2009-06-12 14:22:27 +00:00
|
|
|
/* ************ custom buttons, old stuff ************** */
|
|
|
|
|
2013-10-25 23:50:55 +00:00
|
|
|
/* draws in resolution of 48x4 colors */
|
2012-12-13 02:40:49 +00:00
|
|
|
void ui_draw_gradient(const rcti *rect, const float hsv[3], const int type, const float alpha)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
2013-10-25 23:50:55 +00:00
|
|
|
/* allows for 4 steps (red->yellow) */
|
|
|
|
const float color_step = (1.0 / 48.0);
|
2009-04-03 16:26:03 +00:00
|
|
|
int a;
|
2012-03-30 01:51:25 +00:00
|
|
|
float h = hsv[0], s = hsv[1], v = hsv[2];
|
2010-01-21 00:00:45 +00:00
|
|
|
float dx, dy, sx1, sx2, sy;
|
2012-07-06 23:56:59 +00:00
|
|
|
float col0[4][3]; /* left half, rect bottom to top */
|
|
|
|
float col1[4][3]; /* right half, rect bottom to top */
|
2010-10-13 14:10:42 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
/* draw series of gouraud rects */
|
|
|
|
glShadeModel(GL_SMOOTH);
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
switch (type) {
|
2010-01-21 00:00:45 +00:00
|
|
|
case UI_GRAD_SV:
|
|
|
|
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]);
|
|
|
|
break;
|
|
|
|
case UI_GRAD_HV:
|
|
|
|
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]);
|
|
|
|
break;
|
|
|
|
case UI_GRAD_HS:
|
|
|
|
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]);
|
|
|
|
break;
|
|
|
|
case UI_GRAD_H:
|
|
|
|
hsv_to_rgb(0.0, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col1[1], col1[0]);
|
|
|
|
copy_v3_v3(col1[2], col1[0]);
|
|
|
|
copy_v3_v3(col1[3], col1[0]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
|
|
|
case UI_GRAD_S:
|
|
|
|
hsv_to_rgb(1.0, 0.0, 1.0, &col1[1][0], &col1[1][1], &col1[1][2]);
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col1[0], col1[1]);
|
|
|
|
copy_v3_v3(col1[2], col1[1]);
|
|
|
|
copy_v3_v3(col1[3], col1[1]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
|
|
|
case UI_GRAD_V:
|
|
|
|
hsv_to_rgb(1.0, 1.0, 0.0, &col1[2][0], &col1[2][1], &col1[2][2]);
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col1[0], col1[2]);
|
|
|
|
copy_v3_v3(col1[1], col1[2]);
|
|
|
|
copy_v3_v3(col1[3], col1[2]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
2010-10-17 08:59:23 +00:00
|
|
|
default:
|
|
|
|
assert(!"invalid 'type' argument");
|
|
|
|
hsv_to_rgb(1.0, 1.0, 1.0, &col1[2][0], &col1[2][1], &col1[2][2]);
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col1[0], col1[2]);
|
|
|
|
copy_v3_v3(col1[1], col1[2]);
|
|
|
|
copy_v3_v3(col1[3], col1[2]);
|
2013-07-21 08:16:37 +00:00
|
|
|
break;
|
2010-01-09 06:44:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* old below */
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2012-11-09 10:33:42 +00:00
|
|
|
for (dx = 0.0f; dx < 0.999f; dx += color_step) { /* 0.999 = prevent float inaccuracy for steps */
|
2013-10-25 23:50:55 +00:00
|
|
|
const float dx_next = dx + color_step;
|
|
|
|
|
2012-08-19 10:41:27 +00:00
|
|
|
/* previous color */
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col0[0], col1[0]);
|
|
|
|
copy_v3_v3(col0[1], col1[1]);
|
|
|
|
copy_v3_v3(col0[2], col1[2]);
|
|
|
|
copy_v3_v3(col0[3], col1[3]);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2012-08-19 10:41:27 +00:00
|
|
|
/* new color */
|
2012-03-30 01:51:25 +00:00
|
|
|
switch (type) {
|
2010-01-21 00:00:45 +00:00
|
|
|
case UI_GRAD_SV:
|
|
|
|
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]);
|
|
|
|
break;
|
|
|
|
case UI_GRAD_HV:
|
2013-10-25 23:50:55 +00:00
|
|
|
hsv_to_rgb(dx_next, s, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(dx_next, s, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(dx_next, s, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(dx_next, s, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
|
|
|
case UI_GRAD_HS:
|
2013-10-25 23:50:55 +00:00
|
|
|
hsv_to_rgb(dx_next, 0.0, v, &col1[0][0], &col1[0][1], &col1[0][2]);
|
|
|
|
hsv_to_rgb(dx_next, 0.333, v, &col1[1][0], &col1[1][1], &col1[1][2]);
|
|
|
|
hsv_to_rgb(dx_next, 0.666, v, &col1[2][0], &col1[2][1], &col1[2][2]);
|
|
|
|
hsv_to_rgb(dx_next, 1.0, v, &col1[3][0], &col1[3][1], &col1[3][2]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
|
|
|
case UI_GRAD_H:
|
2012-06-21 19:45:36 +00:00
|
|
|
{
|
|
|
|
/* annoying but without this the color shifts - could be solved some other way
|
|
|
|
* - campbell */
|
2013-10-25 23:50:55 +00:00
|
|
|
hsv_to_rgb(dx_next, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col1[1], col1[0]);
|
|
|
|
copy_v3_v3(col1[2], col1[0]);
|
|
|
|
copy_v3_v3(col1[3], col1[0]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
2012-06-21 19:45:36 +00:00
|
|
|
}
|
2010-01-21 00:00:45 +00:00
|
|
|
case UI_GRAD_S:
|
|
|
|
hsv_to_rgb(h, dx, 1.0, &col1[1][0], &col1[1][1], &col1[1][2]);
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col1[0], col1[1]);
|
|
|
|
copy_v3_v3(col1[2], col1[1]);
|
|
|
|
copy_v3_v3(col1[3], col1[1]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
|
|
|
case UI_GRAD_V:
|
|
|
|
hsv_to_rgb(h, 1.0, dx, &col1[2][0], &col1[2][1], &col1[2][2]);
|
2011-11-06 16:34:44 +00:00
|
|
|
copy_v3_v3(col1[0], col1[2]);
|
|
|
|
copy_v3_v3(col1[1], col1[2]);
|
|
|
|
copy_v3_v3(col1[3], col1[2]);
|
2010-01-21 00:00:45 +00:00
|
|
|
break;
|
2010-01-09 06:44:54 +00:00
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2012-08-19 10:41:27 +00:00
|
|
|
/* rect */
|
2013-10-25 23:50:55 +00:00
|
|
|
sx1 = rect->xmin + dx * BLI_rcti_size_x(rect);
|
|
|
|
sx2 = rect->xmin + dx_next * BLI_rcti_size_x(rect);
|
2012-03-30 01:51:25 +00:00
|
|
|
sy = rect->ymin;
|
2012-11-09 11:03:53 +00:00
|
|
|
dy = (float)BLI_rcti_size_y(rect) / 3.0f;
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
glBegin(GL_QUADS);
|
2012-03-30 01:51:25 +00:00
|
|
|
for (a = 0; a < 3; a++, sy += dy) {
|
2010-01-21 00:00:45 +00:00
|
|
|
glColor4f(col0[a][0], col0[a][1], col0[a][2], alpha);
|
2009-04-03 16:26:03 +00:00
|
|
|
glVertex2f(sx1, sy);
|
|
|
|
|
2010-01-21 00:00:45 +00:00
|
|
|
glColor4f(col1[a][0], col1[a][1], col1[a][2], alpha);
|
2009-04-03 16:26:03 +00:00
|
|
|
glVertex2f(sx2, sy);
|
2010-01-21 00:00:45 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
glColor4f(col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
|
|
|
|
glVertex2f(sx2, sy + dy);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
glColor4f(col0[a + 1][0], col0[a + 1][1], col0[a + 1][2], alpha);
|
|
|
|
glVertex2f(sx1, sy + dy);
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
|
|
|
glShadeModel(GL_FLAT);
|
|
|
|
|
2010-01-21 00:00:45 +00:00
|
|
|
}
|
|
|
|
|
2013-11-20 11:34:18 +01:00
|
|
|
bool ui_hsvcube_use_display_colorspace(uiBut *but)
|
|
|
|
{
|
|
|
|
bool color_profile = but->block->color_profile;
|
|
|
|
|
|
|
|
if (but->rnaprop) {
|
|
|
|
if (RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA)
|
2014-01-04 17:16:19 +11:00
|
|
|
color_profile = false;
|
2013-11-20 11:34:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* SV+H gradient does not use display colorspace */
|
|
|
|
return color_profile && !ELEM((int)but->a1, UI_GRAD_SV, UI_GRAD_H);
|
|
|
|
}
|
|
|
|
|
2013-04-27 12:54:45 +00:00
|
|
|
void ui_hsvcube_pos_from_vals(uiBut *but, const rcti *rect, float *hsv, float *xp, float *yp)
|
|
|
|
{
|
2014-01-06 15:05:21 +01:00
|
|
|
float x = 0.0f, y = 0.0f;
|
|
|
|
|
2013-04-27 12:54:45 +00:00
|
|
|
switch ((int)but->a1) {
|
|
|
|
case UI_GRAD_SV:
|
|
|
|
x = hsv[2]; y = hsv[1]; break;
|
|
|
|
case UI_GRAD_HV:
|
|
|
|
x = hsv[0]; y = hsv[2]; break;
|
|
|
|
case UI_GRAD_HS:
|
|
|
|
x = hsv[0]; y = hsv[1]; break;
|
|
|
|
case UI_GRAD_H:
|
|
|
|
x = hsv[0]; y = 0.5; break;
|
|
|
|
case UI_GRAD_S:
|
|
|
|
x = hsv[1]; y = 0.5; break;
|
|
|
|
case UI_GRAD_V:
|
|
|
|
x = hsv[2]; y = 0.5; break;
|
|
|
|
case UI_GRAD_V_ALT:
|
|
|
|
x = 0.5f;
|
|
|
|
/* exception only for value strip - use the range set in but->min/max */
|
|
|
|
y = (hsv[2] - but->softmin ) / (but->softmax - but->softmin);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* cursor */
|
|
|
|
*xp = rect->xmin + x * BLI_rcti_size_x(rect);
|
|
|
|
*yp = rect->ymin + y * BLI_rcti_size_y(rect);
|
2010-01-21 00:00:45 +00:00
|
|
|
|
2013-04-27 12:54:45 +00:00
|
|
|
}
|
2010-01-21 00:00:45 +00:00
|
|
|
|
2012-12-13 02:40:49 +00:00
|
|
|
static void ui_draw_but_HSVCUBE(uiBut *but, const rcti *rect)
|
2010-01-21 00:00:45 +00:00
|
|
|
{
|
2012-05-26 11:01:01 +00:00
|
|
|
float rgb[3];
|
2012-03-30 01:51:25 +00:00
|
|
|
float x = 0.0f, y = 0.0f;
|
|
|
|
float *hsv = ui_block_hsv_get(but->block);
|
2012-05-26 11:01:01 +00:00
|
|
|
float hsv_n[3];
|
2013-11-20 11:34:18 +01:00
|
|
|
bool use_display_colorspace = ui_hsvcube_use_display_colorspace(but);
|
2010-10-13 13:53:49 +00:00
|
|
|
|
2012-05-26 11:01:01 +00:00
|
|
|
copy_v3_v3(hsv_n, hsv);
|
2010-01-21 00:00:45 +00:00
|
|
|
|
|
|
|
ui_get_but_vectorf(but, rgb);
|
2012-12-15 18:12:38 +00:00
|
|
|
|
2013-11-20 11:34:18 +01:00
|
|
|
if (use_display_colorspace)
|
2012-12-15 18:12:38 +00:00
|
|
|
ui_block_to_display_space_v3(but->block, rgb);
|
|
|
|
|
2012-05-26 11:01:01 +00:00
|
|
|
rgb_to_hsv_compat_v(rgb, hsv_n);
|
2010-01-21 00:00:45 +00:00
|
|
|
|
2012-05-26 11:01:01 +00:00
|
|
|
ui_draw_gradient(rect, hsv_n, but->a1, 1.0f);
|
2013-04-27 12:54:45 +00:00
|
|
|
|
|
|
|
ui_hsvcube_pos_from_vals(but, rect, hsv_n, &x, &y);
|
2012-03-30 01:51:25 +00:00
|
|
|
CLAMP(x, rect->xmin + 3.0f, rect->xmax - 3.0f);
|
|
|
|
CLAMP(y, rect->ymin + 3.0f, rect->ymax - 3.0f);
|
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 */
|
2012-12-13 02:40:49 +00:00
|
|
|
static void ui_draw_but_HSV_v(uiBut *but, const rcti *rect)
|
2009-06-12 14:22:27 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
2012-12-13 02:40:49 +00:00
|
|
|
const float rad = 0.5f * BLI_rcti_size_x(rect);
|
2009-06-12 14:22:27 +00:00
|
|
|
float x, y;
|
2010-01-27 00:22:29 +00:00
|
|
|
float rgb[3], hsv[3], v, range;
|
2014-01-04 17:16:19 +11:00
|
|
|
bool color_profile = but->block->color_profile;
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
|
2010-08-25 07:49:12 +00:00
|
|
|
if (but->rnaprop && RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA)
|
2014-01-04 17:16:19 +11:00
|
|
|
color_profile = false;
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
|
2010-01-07 09:55:11 +00:00
|
|
|
ui_get_but_vectorf(but, rgb);
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
|
|
|
|
if (color_profile)
|
|
|
|
ui_block_to_display_space_v3(but->block, rgb);
|
|
|
|
|
2012-05-26 11:01:01 +00:00
|
|
|
rgb_to_hsv_v(rgb, hsv);
|
2010-01-07 09:55:11 +00:00
|
|
|
v = hsv[2];
|
|
|
|
|
2010-01-27 00:22:29 +00:00
|
|
|
/* map v from property range to [0,1] */
|
|
|
|
range = but->softmax - but->softmin;
|
2012-03-30 01:51:25 +00:00
|
|
|
v = (v - but->softmin) / range;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* fully rounded */
|
2011-09-11 06:41:09 +00:00
|
|
|
round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
/* setup temp colors */
|
2012-03-30 01:51:25 +00:00
|
|
|
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;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb, &wcol_tmp);
|
|
|
|
|
|
|
|
/* cursor */
|
2012-09-15 11:48:20 +00:00
|
|
|
x = rect->xmin + 0.5f * BLI_rcti_size_x(rect);
|
|
|
|
y = rect->ymin + v * BLI_rcti_size_y(rect);
|
2012-03-30 01:51:25 +00:00
|
|
|
CLAMP(y, rect->ymin + 3.0f, rect->ymax - 3.0f);
|
2009-06-12 14:22:27 +00:00
|
|
|
|
|
|
|
ui_hsv_cursor(x, y);
|
|
|
|
|
|
|
|
}
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2010-01-19 01:32:06 +00:00
|
|
|
|
2010-01-11 01:26:16 +00:00
|
|
|
/* ************ separator, for menus etc ***************** */
|
2012-12-13 02:40:49 +00:00
|
|
|
static void ui_draw_separator(const rcti *rect, uiWidgetColors *wcol)
|
2010-01-11 01:26:16 +00:00
|
|
|
{
|
2012-09-15 11:48:20 +00:00
|
|
|
int y = rect->ymin + BLI_rcti_size_y(rect) / 2 - 1;
|
2010-01-14 21:30:51 +00:00
|
|
|
unsigned char col[4];
|
2010-01-11 01:26:16 +00:00
|
|
|
|
|
|
|
col[0] = wcol->text[0];
|
|
|
|
col[1] = wcol->text[1];
|
|
|
|
col[2] = wcol->text[2];
|
2014-01-17 00:23:00 +01:00
|
|
|
col[3] = 30;
|
2010-01-11 01:26:16 +00:00
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glColor4ubv(col);
|
|
|
|
sdrawline(rect->xmin, y, rect->xmax, y);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
/* ************ button callbacks, draw ***************** */
|
2013-06-18 09:02:13 +00:00
|
|
|
static void widget_numbut_draw(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, bool emboss)
|
2009-04-02 15:01:11 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
2012-12-13 02:40:49 +00:00
|
|
|
const float rad = 0.5f * BLI_rcti_size_y(rect);
|
2013-12-11 21:27:13 +11:00
|
|
|
float textofs = rad * 0.85f;
|
2009-11-11 10:27:25 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT)
|
2010-09-11 00:08:07 +00:00
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2013-06-18 09:02:13 +00:00
|
|
|
if (!emboss) {
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
|
|
|
}
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* decoration */
|
2012-03-24 06:38:07 +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
|
|
|
}
|
|
|
|
|
2013-06-18 09:02:13 +00:00
|
|
|
static void widget_numbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
widget_numbut_draw(wcol, rect, state, roundboxalign, false);
|
|
|
|
}
|
|
|
|
|
2013-11-24 15:23:38 +11:00
|
|
|
/**
|
2013-06-18 09:02:13 +00:00
|
|
|
* Draw number buttons still with triangles when field is not embossed
|
2013-11-24 15:23:38 +11:00
|
|
|
*/
|
2013-06-18 10:09:45 +00:00
|
|
|
static void widget_numbut_embossn(uiBut *UNUSED(but), uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2013-06-18 09:02:13 +00:00
|
|
|
{
|
|
|
|
widget_numbut_draw(wcol, rect, state, roundboxalign, true);
|
|
|
|
}
|
|
|
|
|
2012-12-13 02:40:49 +00:00
|
|
|
int ui_link_bezier_points(const rcti *rect, float coord_array[][2], int resol)
|
2009-06-17 11:01:05 +00:00
|
|
|
{
|
|
|
|
float dist, vec[4][2];
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
vec[0][0] = rect->xmin;
|
|
|
|
vec[0][1] = rect->ymin;
|
|
|
|
vec[3][0] = rect->xmax;
|
|
|
|
vec[3][1] = rect->ymax;
|
2009-06-17 11:01:05 +00:00
|
|
|
|
2013-12-01 13:11:12 +11:00
|
|
|
dist = 0.5f * fabsf(vec[0][0] - vec[3][0]);
|
2009-06-17 11:01:05 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
vec[1][0] = vec[0][0] + dist;
|
|
|
|
vec[1][1] = vec[0][1];
|
2009-06-17 11:01:05 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
vec[2][0] = vec[3][0] - dist;
|
|
|
|
vec[2][1] = vec[3][1];
|
2009-06-17 11:01:05 +00:00
|
|
|
|
2012-04-28 16:49:00 +00:00
|
|
|
BKE_curve_forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float) * 2);
|
|
|
|
BKE_curve_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;
|
|
|
|
}
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
#define LINK_RESOL 24
|
2012-12-13 02:40:49 +00:00
|
|
|
void ui_draw_link_bezier(const rcti *rect)
|
2009-06-17 11:01:05 +00:00
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
float coord_array[LINK_RESOL + 1][2];
|
2009-06-17 11:01:05 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ui_link_bezier_points(rect, coord_array, LINK_RESOL)) {
|
2009-06-17 11:01:05 +00:00
|
|
|
/* we can reuse the dist variable here to increment the GL curve eval amount*/
|
2012-08-19 10:41:27 +00:00
|
|
|
// const float dist = 1.0f / (float)LINK_RESOL; // UNUSED
|
2011-03-28 02:34:55 +00:00
|
|
|
|
2009-06-17 11:01:05 +00:00
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
2011-09-09 14:44:36 +00:00
|
|
|
|
|
|
|
glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
glVertexPointer(2, GL_FLOAT, 0, coord_array);
|
2012-12-29 15:55:37 +00:00
|
|
|
glDrawArrays(GL_LINE_STRIP, 0, LINK_RESOL + 1);
|
2011-09-09 14:44:36 +00:00
|
|
|
glDisableClientState(GL_VERTEX_ARRAY);
|
|
|
|
|
2009-06-17 11:01:05 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
/* function in use for buttons and for view2d sliders */
|
2012-12-13 02:40:49 +00:00
|
|
|
void uiWidgetScrollDraw(uiWidgetColors *wcol, const rcti *rect, const rcti *slider, int state)
|
2009-06-24 14:16:56 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
int horizontal;
|
2012-12-13 02:40:49 +00:00
|
|
|
float rad;
|
2013-07-19 10:39:44 +00:00
|
|
|
bool outline = false;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
widget_init(&wtb);
|
|
|
|
|
2009-06-24 14:16:56 +00:00
|
|
|
/* determine horizontal/vertical */
|
2012-09-15 11:48:20 +00:00
|
|
|
horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
|
2012-12-13 02:40:49 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (horizontal)
|
2012-09-15 11:48:20 +00:00
|
|
|
rad = 0.5f * BLI_rcti_size_y(rect);
|
2009-06-24 14:16:56 +00:00
|
|
|
else
|
2012-09-15 11:48:20 +00:00
|
|
|
rad = 0.5f * BLI_rcti_size_x(rect);
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2012-03-30 01:51:25 +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 */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (horizontal)
|
2009-06-24 14:16:56 +00:00
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
2011-09-11 06:41:09 +00:00
|
|
|
round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
|
2009-06-24 14:16:56 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
/* slider */
|
2012-09-15 11:48:20 +00:00
|
|
|
if ((BLI_rcti_size_x(slider) < 2) || (BLI_rcti_size_y(slider) < 2)) {
|
2012-08-20 23:06:17 +00:00
|
|
|
/* pass */
|
|
|
|
}
|
2009-07-02 18:12:46 +00:00
|
|
|
else {
|
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v4_v4_char(wcol->inner, wcol->item);
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (wcol->shadetop > wcol->shadedown)
|
|
|
|
wcol->shadetop += 20; /* XXX violates themes... */
|
|
|
|
else wcol->shadedown += 20;
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SCROLL_PRESSED) {
|
2012-03-30 01:51:25 +00:00
|
|
|
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-23 20:50:24 +00:00
|
|
|
}
|
2009-07-02 18:12:46 +00:00
|
|
|
|
|
|
|
/* draw */
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb.emboss = 0; /* only emboss once */
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2010-05-27 08:22:16 +00:00
|
|
|
/* exception for progress bar */
|
2013-07-19 10:39:44 +00:00
|
|
|
if (state & UI_SCROLL_NO_OUTLINE) {
|
|
|
|
SWAP(bool, outline, wtb.outline);
|
|
|
|
}
|
2010-05-27 08:22:16 +00:00
|
|
|
|
2011-09-11 06:41:09 +00:00
|
|
|
round_box_edges(&wtb, UI_CNR_ALL, slider, rad);
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SCROLL_ARROWS) {
|
2012-03-30 01:51:25 +00:00
|
|
|
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;
|
2009-07-03 13:21:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
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);
|
2010-05-27 08:22:16 +00:00
|
|
|
|
2013-07-19 10:39:44 +00:00
|
|
|
if (state & UI_SCROLL_NO_OUTLINE) {
|
|
|
|
SWAP(bool, outline, wtb.outline);
|
|
|
|
}
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-07-02 18:12:46 +00:00
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_scroll(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int UNUSED(roundboxalign))
|
2009-07-02 18:12:46 +00:00
|
|
|
{
|
|
|
|
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 */
|
2012-03-30 01:51:25 +00:00
|
|
|
value = ui_get_but_val(but);
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
size = (but->softmax + but->a1 - but->softmin);
|
2012-10-27 11:18:54 +00:00
|
|
|
size = max_ff(size, 2.0f);
|
2009-06-24 14:16:56 +00:00
|
|
|
|
|
|
|
/* position */
|
2012-03-30 01:51:25 +00:00
|
|
|
rect1 = *rect;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2009-07-02 18:12:46 +00:00
|
|
|
/* determine horizontal/vertical */
|
2012-09-15 11:48:20 +00:00
|
|
|
horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
|
2009-07-02 18:12:46 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (horizontal) {
|
2012-09-15 11:48:20 +00:00
|
|
|
fac = BLI_rcti_size_x(rect) / size;
|
2012-03-30 01:51:25 +00:00
|
|
|
rect1.xmin = rect1.xmin + ceilf(fac * ((float)value - but->softmin));
|
|
|
|
rect1.xmax = rect1.xmin + ceilf(fac * (but->a1 - but->softmin));
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
/* ensure minimium size */
|
2012-09-15 11:48:20 +00:00
|
|
|
min = BLI_rcti_size_y(rect);
|
2009-07-21 01:26:17 +00:00
|
|
|
|
2012-09-15 11:48:20 +00:00
|
|
|
if (BLI_rcti_size_x(&rect1) < min) {
|
2012-03-24 02:51:46 +00:00
|
|
|
rect1.xmax = rect1.xmin + min;
|
2009-07-21 01:26:17 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (rect1.xmax > rect->xmax) {
|
2012-03-24 02:51:46 +00:00
|
|
|
rect1.xmax = rect->xmax;
|
2012-10-23 13:28:22 +00:00
|
|
|
rect1.xmin = max_ii(rect1.xmax - min, rect->xmin);
|
2009-07-21 01:26:17 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-24 14:16:56 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-09-15 11:48:20 +00:00
|
|
|
fac = BLI_rcti_size_y(rect) / size;
|
2012-03-30 01:51:25 +00:00
|
|
|
rect1.ymax = rect1.ymax - ceilf(fac * ((float)value - but->softmin));
|
|
|
|
rect1.ymin = rect1.ymax - ceilf(fac * (but->a1 - but->softmin));
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
/* ensure minimium size */
|
2012-09-15 11:48:20 +00:00
|
|
|
min = BLI_rcti_size_x(rect);
|
2009-07-21 01:26:17 +00:00
|
|
|
|
2012-09-15 11:48:20 +00:00
|
|
|
if (BLI_rcti_size_y(&rect1) < min) {
|
2012-03-24 02:51:46 +00:00
|
|
|
rect1.ymax = rect1.ymin + min;
|
2009-07-21 01:26:17 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (rect1.ymax > rect->ymax) {
|
2012-03-24 02:51:46 +00:00
|
|
|
rect1.ymax = rect->ymax;
|
2012-10-27 11:18:54 +00:00
|
|
|
rect1.ymin = max_ii(rect1.ymax - min, rect->ymin);
|
2009-07-21 01:26:17 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-24 14:16:56 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT)
|
2012-03-30 01:51:25 +00:00
|
|
|
state = UI_SCROLL_PRESSED;
|
2009-07-03 13:21:09 +00:00
|
|
|
else
|
2012-03-30 01:51:25 +00:00
|
|
|
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
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_progressbar(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
|
2009-06-17 11:01:05 +00:00
|
|
|
{
|
2010-05-27 08:22:16 +00:00
|
|
|
rcti rect_prog = *rect, rect_bar = *rect;
|
|
|
|
float value = but->a1;
|
|
|
|
float w, min;
|
|
|
|
|
|
|
|
/* make the progress bar a proportion of the original height */
|
|
|
|
/* hardcoded 4px high for now */
|
2013-04-05 17:57:26 +00:00
|
|
|
rect_prog.ymax = rect_prog.ymin + 4 * UI_DPI_FAC;
|
|
|
|
rect_bar.ymax = rect_bar.ymin + 4 * UI_DPI_FAC;
|
2010-05-27 08:22:16 +00:00
|
|
|
|
2012-09-15 11:48:20 +00:00
|
|
|
w = value * BLI_rcti_size_x(&rect_prog);
|
2010-05-27 08:22:16 +00:00
|
|
|
|
|
|
|
/* ensure minimium size */
|
2012-09-15 11:48:20 +00:00
|
|
|
min = BLI_rcti_size_y(&rect_prog);
|
2010-05-27 08:22:16 +00:00
|
|
|
w = MAX2(w, min);
|
|
|
|
|
|
|
|
rect_bar.xmax = rect_bar.xmin + w;
|
|
|
|
|
|
|
|
uiWidgetScrollDraw(wcol, &rect_prog, &rect_bar, UI_SCROLL_NO_OUTLINE);
|
|
|
|
|
|
|
|
/* raise text a bit */
|
2013-04-05 17:57:26 +00:00
|
|
|
rect->ymin += 6 * UI_DPI_FAC;
|
|
|
|
rect->xmin -= 6 * UI_DPI_FAC;
|
2010-05-27 08:22:16 +00:00
|
|
|
}
|
2009-06-17 11:01:05 +00:00
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_link(uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
|
2010-05-27 08:22:16 +00:00
|
|
|
{
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->flag & UI_SELECT) {
|
2009-06-17 11:01:05 +00:00
|
|
|
rcti rectlink;
|
|
|
|
|
|
|
|
UI_ThemeColor(TH_TEXT_HI);
|
|
|
|
|
2012-09-15 11:48:20 +00:00
|
|
|
rectlink.xmin = BLI_rcti_cent_x(rect);
|
|
|
|
rectlink.ymin = BLI_rcti_cent_y(rect);
|
2012-03-24 02:51:46 +00:00
|
|
|
rectlink.xmax = but->linkto[0];
|
|
|
|
rectlink.ymax = but->linkto[1];
|
2009-06-17 11:01:05 +00:00
|
|
|
|
|
|
|
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;
|
2010-10-05 15:44:58 +00:00
|
|
|
float offs, toffs, fac;
|
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 outline[3];
|
2011-04-25 11:52:42 +00:00
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widget_init(&wtb);
|
|
|
|
widget_init(&wtb1);
|
|
|
|
|
|
|
|
/* backdrop first */
|
|
|
|
|
|
|
|
/* fully rounded */
|
2012-09-15 11:48:20 +00:00
|
|
|
offs = 0.5f * BLI_rcti_size_y(rect);
|
2012-03-30 01:51:25 +00:00
|
|
|
toffs = offs * 0.75f;
|
2009-04-02 18:16:15 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, offs);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb.outline = 0;
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
2011-06-11 12:10:01 +00:00
|
|
|
/* draw left/right parts only when not in text editing */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(state & UI_TEXTINPUT)) {
|
2014-01-29 04:10:39 +11:00
|
|
|
int roundboxalign_slider;
|
2011-06-11 12:10:01 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
/* slider part */
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v3_v3_char(outline, wcol->outline);
|
|
|
|
copy_v3_v3_char(wcol->outline, wcol->item);
|
|
|
|
copy_v3_v3_char(wcol->inner, wcol->item);
|
2010-09-07 11:14:20 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(state & UI_SELECT))
|
2011-06-11 12:10:01 +00:00
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
rect1 = *rect;
|
2011-06-11 12:10:01 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
value = ui_get_but_val(but);
|
2012-09-15 11:48:20 +00:00
|
|
|
fac = ((float)value - but->softmin) * (BLI_rcti_size_x(&rect1) - offs) / (but->softmax - but->softmin);
|
2011-06-11 12:10:01 +00:00
|
|
|
|
|
|
|
/* left part of slider, always rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect1.xmax = rect1.xmin + ceil(offs + U.pixelsize);
|
2011-09-11 06:41:09 +00:00
|
|
|
round_box_edges(&wtb1, roundboxalign & ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT), &rect1, offs);
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb1.outline = 0;
|
2011-06-11 12:10:01 +00:00
|
|
|
widgetbase_draw(&wtb1, wcol);
|
|
|
|
|
|
|
|
/* right part of slider, interpolate roundness */
|
2012-03-24 02:51:46 +00:00
|
|
|
rect1.xmax = rect1.xmin + fac + offs;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect1.xmin += floor(offs - U.pixelsize);
|
|
|
|
|
2014-01-29 04:10:39 +11:00
|
|
|
if (rect1.xmax + offs > rect->xmax) {
|
|
|
|
roundboxalign_slider = roundboxalign & ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
|
2012-03-30 01:51:25 +00:00
|
|
|
offs *= (rect1.xmax + offs - rect->xmax) / offs;
|
2014-01-29 04:10:39 +11:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
roundboxalign_slider = 0;
|
2012-03-30 01:51:25 +00:00
|
|
|
offs = 0.0f;
|
2014-01-29 04:10:39 +11:00
|
|
|
}
|
|
|
|
round_box_edges(&wtb1, roundboxalign_slider, &rect1, offs);
|
2011-06-11 12:10:01 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb1, wcol);
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v3_v3_char(wcol->outline, outline);
|
2011-06-11 12:10:01 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(state & UI_SELECT))
|
2011-06-11 12:10:01 +00:00
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
}
|
2009-04-02 18:16:15 +00:00
|
|
|
|
|
|
|
/* outline */
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb.outline = 1;
|
|
|
|
wtb.inner = 0;
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
2009-05-21 17:09:06 +00:00
|
|
|
/* text space */
|
2013-12-13 05:28:24 +11:00
|
|
|
if ((roundboxalign & UI_CNR_TOP_LEFT) && (roundboxalign & UI_CNR_BOTTOM_LEFT))
|
|
|
|
rect->xmin += toffs;
|
|
|
|
if ((roundboxalign & UI_CNR_TOP_RIGHT) && (roundboxalign & UI_CNR_BOTTOM_RIGHT))
|
|
|
|
rect->xmax -= toffs;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2010-09-30 12:10:18 +00:00
|
|
|
/* I think 3 is sufficient border to indicate keyed status */
|
|
|
|
#define SWATCH_KEYED_BORDER 3
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad, col[4];
|
2014-01-04 17:16:19 +11:00
|
|
|
bool color_profile = but->block->color_profile;
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
col[3] = 1.0f;
|
2010-06-26 17:12:55 +00:00
|
|
|
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
if (but->rnaprop) {
|
2012-12-18 17:00:49 +00:00
|
|
|
BLI_assert(but->rnaindex == -1);
|
|
|
|
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
if (RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA)
|
2014-01-04 17:16:19 +11:00
|
|
|
color_profile = false;
|
2010-06-26 17:12:55 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (RNA_property_array_length(&but->rnapoin, but->rnaprop) == 4) {
|
|
|
|
col[3] = RNA_property_float_get_index(&but->rnapoin, but->rnaprop, 3);
|
2010-06-26 17:12:55 +00:00
|
|
|
}
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* half rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.25f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
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);
|
2012-07-06 23:56:59 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT)) {
|
2012-07-06 23:56:59 +00:00
|
|
|
/* draw based on state - color for keyed etc */
|
2010-09-30 12:10:18 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2012-07-06 23:56:59 +00:00
|
|
|
|
|
|
|
/* inset to draw swatch color */
|
2012-03-30 01:51:25 +00:00
|
|
|
rect->xmin += SWATCH_KEYED_BORDER;
|
|
|
|
rect->xmax -= SWATCH_KEYED_BORDER;
|
|
|
|
rect->ymin += SWATCH_KEYED_BORDER;
|
|
|
|
rect->ymax -= SWATCH_KEYED_BORDER;
|
2010-09-30 12:10:18 +00:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
2010-09-30 12:10:18 +00:00
|
|
|
}
|
|
|
|
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
if (color_profile)
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
ui_block_to_display_space_v3(but->block, col);
|
Changes to Color Management
After testing and feedback, I've decided to slightly modify the way color
management works internally. While the previous method worked well for
rendering, was a smaller transition and had some advantages over this
new method, it was a bit more ambiguous, and was making things difficult
for other areas such as compositing.
This implementation now considers all color data (with only a couple of
exceptions such as brush colors) to be stored in linear RGB color space,
rather than sRGB as previously. This brings it in line with Nuke, which also
operates this way, quite successfully. Color swatches, pickers, color ramp
display are now gamma corrected to display gamma so you can see what
you're doing, but the numbers themselves are considered linear. This
makes understanding blending modes more clear (a 0.5 value on overlay
will not change the result now) as well as making color swatches act more
predictably in the compositor, however bringing over color values from
applications like photoshop or gimp, that operate in a gamma space,
will give identical results.
This commit will convert over existing files saved by earlier 2.5 versions to
work generally the same, though there may be some slight differences with
things like textures. Now that we're set on changing other areas of shading,
this won't be too disruptive overall.
I've made a diagram explaining the pipeline here:
http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png
and some docs here:
http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
|
|
|
|
2012-01-19 10:04:51 +00:00
|
|
|
rgba_float_to_uchar((unsigned char *)wcol->inner, col);
|
2012-01-14 11:21:00 +00:00
|
|
|
|
2010-01-21 05:14:05 +00:00
|
|
|
wcol->shaded = 0;
|
2010-06-26 17:12:55 +00:00
|
|
|
wcol->alpha_check = (wcol->inner[3] < 255);
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2012-11-17 16:11:02 +00:00
|
|
|
static void widget_normal(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
|
|
|
|
{
|
|
|
|
ui_draw_but_NORMAL(but, wcol, rect);
|
|
|
|
}
|
|
|
|
|
2013-06-18 09:02:13 +00:00
|
|
|
static void widget_icon_has_anim(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2010-12-09 18:08:58 +00:00
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT)) {
|
2010-12-09 18:08:58 +00:00
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
|
|
|
|
2010-12-09 18:08:58 +00:00
|
|
|
widget_init(&wtb);
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb.outline = 0;
|
2010-12-09 18:08:58 +00:00
|
|
|
|
|
|
|
/* rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.5f * BLI_rcti_size_y(rect);
|
|
|
|
round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
|
2010-12-09 18:08:58 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2013-06-18 09:02:13 +00:00
|
|
|
else if (but->type == NUM) {
|
|
|
|
/* Draw number buttons still with left/right
|
|
|
|
* triangles when field is not embossed */
|
|
|
|
widget_numbut_embossn(but, wcol, rect, state, roundboxalign);
|
|
|
|
}
|
2010-12-09 18:08:58 +00:00
|
|
|
}
|
|
|
|
|
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;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_SELECT)
|
2010-09-11 00:08:07 +00:00
|
|
|
SWAP(short, wcol->shadetop, wcol->shadedown);
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* half rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
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
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_menubut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
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 */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
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
|
|
|
|
2012-10-25 10:51:03 +00:00
|
|
|
/* text space, arrows are about 0.6 height of button */
|
2012-11-01 09:54:00 +00:00
|
|
|
rect->xmax -= (6 * BLI_rcti_size_y(rect)) / 10;
|
2009-09-28 15:59:09 +00:00
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_menuiconbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
|
2009-09-28 15:59:09 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
2009-09-28 15:59:09 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* half rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
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
|
|
|
}
|
|
|
|
|
2011-11-07 22:28:49 +00:00
|
|
|
static void widget_menunodebut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
|
|
|
|
{
|
|
|
|
/* silly node link button hacks */
|
|
|
|
uiWidgetBase wtb;
|
2012-03-30 01:51:25 +00:00
|
|
|
uiWidgetColors wcol_backup = *wcol;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
2011-11-07 22:28:49 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* half rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
2011-11-07 22:28:49 +00:00
|
|
|
|
2014-01-08 20:40:37 +01:00
|
|
|
wcol->inner[0] = min_ii(wcol->inner[0] + 15, 255);
|
|
|
|
wcol->inner[1] = min_ii(wcol->inner[1] + 15, 255);
|
|
|
|
wcol->inner[2] = min_ii(wcol->inner[2] + 15, 255);
|
|
|
|
wcol->outline[0] = min_ii(wcol->outline[0] + 15, 255);
|
|
|
|
wcol->outline[1] = min_ii(wcol->outline[1] + 15, 255);
|
|
|
|
wcol->outline[2] = min_ii(wcol->outline[2] + 15, 255);
|
2011-11-07 22:28:49 +00:00
|
|
|
|
|
|
|
/* decoration */
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
2012-03-30 01:51:25 +00:00
|
|
|
*wcol = wcol_backup;
|
2011-11-07 22:28:49 +00:00
|
|
|
}
|
|
|
|
|
2012-10-04 20:12:05 +00:00
|
|
|
static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (state & UI_ACTIVE) {
|
2009-04-03 16:26:03 +00:00
|
|
|
uiWidgetBase wtb;
|
2012-12-13 02:40:49 +00:00
|
|
|
const float rad = 0.2f * U.widget_unit;
|
2012-10-04 20:12:05 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
widget_init(&wtb);
|
2012-10-04 20:12:05 +00:00
|
|
|
|
2009-08-23 21:56:32 +00:00
|
|
|
/* half rounded */
|
2012-10-04 20:12:05 +00:00
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_menu_itembut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* not rounded, no outline */
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb.outline = 0;
|
2009-04-03 16:26:03 +00:00
|
|
|
round_box_edges(&wtb, 0, rect, 0.0f);
|
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_list_itembut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
|
2009-07-21 01:26:17 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
|
|
|
/* rounded, but no outline */
|
2012-03-30 01:51:25 +00:00
|
|
|
wtb.outline = 0;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_optionbut(uiWidgetColors *wcol, rcti *rect, int state, int UNUSED(roundboxalign))
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2012-03-30 01:51:25 +00:00
|
|
|
rcti recttemp = *rect;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
2009-03-25 16:58:42 +00:00
|
|
|
int delta;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
widget_init(&wtb);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* square */
|
2012-09-15 11:48:20 +00:00
|
|
|
recttemp.xmax = recttemp.xmin + BLI_rcti_size_y(&recttemp);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* smaller */
|
2012-09-15 11:48:20 +00:00
|
|
|
delta = 1 + BLI_rcti_size_y(&recttemp) / 8;
|
2012-03-30 01:51:25 +00:00
|
|
|
recttemp.xmin += delta;
|
|
|
|
recttemp.ymin += delta;
|
|
|
|
recttemp.xmax -= delta;
|
|
|
|
recttemp.ymax -= delta;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* half rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, UI_CNR_ALL, &recttemp, rad);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
/* decoration */
|
2012-03-24 06:38:07 +00:00
|
|
|
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 */
|
2012-09-15 11:48:20 +00:00
|
|
|
rect->xmin += BLI_rcti_size_y(rect) * 0.7 + delta;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2013-08-26 09:59:51 +00:00
|
|
|
/* labels use Editor theme colors for text */
|
|
|
|
static void widget_state_label(uiWidgetType *wt, int state)
|
|
|
|
{
|
2013-11-21 16:51:29 +01:00
|
|
|
if (state & UI_BUT_LIST_ITEM) {
|
|
|
|
/* Override default label theme's colors. */
|
|
|
|
bTheme *btheme = UI_GetTheme();
|
|
|
|
wt->wcol_theme = &btheme->tui.wcol_list_item;
|
|
|
|
/* call this for option button */
|
|
|
|
widget_state(wt, state);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* call this for option button */
|
|
|
|
widget_state(wt, state);
|
|
|
|
if (state & UI_SELECT)
|
|
|
|
UI_GetThemeColor3ubv(TH_TEXT_HI, (unsigned char *)wt->wcol.text);
|
|
|
|
else
|
|
|
|
UI_GetThemeColor3ubv(TH_TEXT, (unsigned char *)wt->wcol.text);
|
|
|
|
}
|
2013-08-26 09:59:51 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_radiobut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
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 */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
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
|
|
|
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_box(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
|
2010-04-06 07:02:16 +00:00
|
|
|
{
|
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
2010-06-03 07:27:55 +00:00
|
|
|
char old_col[3];
|
2010-04-06 07:02:16 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v3_v3_char(old_col, wcol->inner);
|
2010-06-03 07:27:55 +00:00
|
|
|
|
2010-12-03 12:30:59 +00:00
|
|
|
/* abuse but->hsv - if it's non-zero, use this color as the box's background */
|
2010-10-13 13:53:49 +00:00
|
|
|
if (but->col[3]) {
|
|
|
|
wcol->inner[0] = but->col[0];
|
|
|
|
wcol->inner[1] = but->col[1];
|
|
|
|
wcol->inner[2] = but->col[2];
|
2010-06-03 07:27:55 +00:00
|
|
|
}
|
|
|
|
|
2010-04-06 07:02:16 +00:00
|
|
|
/* half rounded */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
2010-04-06 07:02:16 +00:00
|
|
|
|
|
|
|
widgetbase_draw(&wtb, wcol);
|
2013-03-18 18:29:22 +00:00
|
|
|
|
2011-11-07 01:38:32 +00:00
|
|
|
copy_v3_v3_char(wcol->inner, old_col);
|
2010-04-06 07:02:16 +00:00
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_but(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float rad;
|
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 */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rad = 0.2f * U.widget_unit;
|
|
|
|
round_box_edges(&wtb, roundboxalign, rect, rad);
|
|
|
|
|
2009-04-02 18:16:15 +00:00
|
|
|
widgetbase_draw(&wtb, wcol);
|
2009-03-25 16:58:42 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2009-04-02 15:01:11 +00:00
|
|
|
uiWidgetBase wtb;
|
2012-12-13 02:40:49 +00:00
|
|
|
const float rad = 0.25f * U.widget_unit;
|
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;
|
2012-12-13 02:40:49 +00:00
|
|
|
const float rad = 0.25f * U.widget_unit;
|
2010-12-20 03:59:22 +00:00
|
|
|
unsigned char col[4];
|
2009-06-08 10:00:14 +00:00
|
|
|
|
|
|
|
/* state copy! */
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->wcol = *(wt->wcol_theme);
|
2009-06-08 10:00:14 +00:00
|
|
|
|
|
|
|
widget_init(&wtb);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
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);
|
2010-12-20 03:59:22 +00:00
|
|
|
glColor3ubv(col);
|
2009-06-08 12:39:39 +00:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
round_box__edges(&wtb, UI_CNR_ALL, rect, 0.0f, rad);
|
2009-06-08 12:39:39 +00:00
|
|
|
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 */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
|
2012-03-30 01:51:25 +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 uiWidgetType *widget_type(uiWidgetTypeEnum type)
|
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
bTheme *btheme = UI_GetTheme();
|
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 */
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_regular;
|
|
|
|
wt.wcol_state = &btheme->tui.wcol_state;
|
|
|
|
wt.state = widget_state;
|
|
|
|
wt.draw = widget_but;
|
|
|
|
wt.custom = NULL;
|
|
|
|
wt.text = widget_draw_text_icon;
|
|
|
|
|
|
|
|
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:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.draw = NULL;
|
2013-08-26 09:59:51 +00:00
|
|
|
wt.state = widget_state_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
|
|
|
break;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_TOGGLE:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_toggle;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_OPTION:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_option;
|
|
|
|
wt.draw = widget_optionbut;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_RADIO:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_radio;
|
|
|
|
wt.draw = widget_radiobut;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_NUMBER:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_num;
|
|
|
|
wt.draw = widget_numbut;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_SLIDER:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_numslider;
|
|
|
|
wt.custom = widget_numslider;
|
|
|
|
wt.state = widget_state_numslider;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_EXEC:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_tool;
|
|
|
|
wt.draw = widget_roundbut;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
2012-03-19 22:29:16 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_TOOLTIP:
|
|
|
|
wt.wcol_theme = &btheme->tui.wcol_tooltip;
|
|
|
|
wt.draw = widget_menu_back;
|
|
|
|
break;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
/* strings */
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_NAME:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_text;
|
|
|
|
wt.draw = widget_textbut;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_NAME_LINK:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_POINTER_LINK:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_FILENAME:
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
/* start menus */
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_MENU_RADIO:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_menu;
|
|
|
|
wt.draw = widget_menubut;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
2009-09-28 15:59:09 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_MENU_ICON_RADIO:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_menu;
|
|
|
|
wt.draw = widget_menuiconbut;
|
2009-09-28 15:59:09 +00:00
|
|
|
break;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_MENU_POINTER_LINK:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_menu;
|
|
|
|
wt.draw = widget_menubut;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
2011-11-07 22:28:49 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_MENU_NODE_LINK:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_menu;
|
|
|
|
wt.draw = widget_menunodebut;
|
2011-11-07 22:28:49 +00:00
|
|
|
break;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_PULLDOWN:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_pulldown;
|
|
|
|
wt.draw = widget_pulldownbut;
|
|
|
|
wt.state = widget_state_pulldown;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
/* in menus */
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_MENU_ITEM:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_menu_item;
|
|
|
|
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:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_menu_back;
|
|
|
|
wt.draw = widget_menu_back;
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
/* specials */
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_ICON:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.custom = widget_icon_has_anim;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_SWATCH:
|
2012-03-30 01:51:25 +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:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.custom = widget_box;
|
|
|
|
wt.wcol_theme = &btheme->tui.wcol_box;
|
2009-06-01 11:31:06 +00:00
|
|
|
break;
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
case UI_WTYPE_RGB_PICKER:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case UI_WTYPE_NORMAL:
|
2012-11-17 16:11:02 +00:00
|
|
|
wt.custom = widget_normal;
|
2009-04-02 15:01:11 +00:00
|
|
|
break;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_SCROLL:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_scroll;
|
|
|
|
wt.state = widget_state_nothing;
|
|
|
|
wt.custom = widget_scroll;
|
2009-06-24 14:16:56 +00:00
|
|
|
break;
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_LISTITEM:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_list_item;
|
|
|
|
wt.draw = widget_list_itembut;
|
2009-07-21 01:26:17 +00:00
|
|
|
break;
|
2010-05-27 08:22:16 +00:00
|
|
|
|
|
|
|
case UI_WTYPE_PROGRESSBAR:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt.wcol_theme = &btheme->tui.wcol_progress;
|
|
|
|
wt.custom = widget_progressbar;
|
2010-05-27 08:22:16 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-09-09 13:37:17 +00:00
|
|
|
static int widget_roundbox_set(uiBut *but, rcti *rect)
|
2009-03-25 16:58:42 +00:00
|
|
|
{
|
2012-10-04 20:12:05 +00:00
|
|
|
int roundbox = UI_CNR_ALL;
|
|
|
|
|
2009-03-25 16:58:42 +00:00
|
|
|
/* alignment */
|
2013-11-21 14:43:08 +01:00
|
|
|
if ((but->drawflag & UI_BUT_ALIGN) && but->type != PULLDOWN) {
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2012-10-04 20:12:05 +00:00
|
|
|
/* ui_block_position has this correction too, keep in sync */
|
2013-11-21 14:43:08 +01:00
|
|
|
if (but->drawflag & UI_BUT_ALIGN_TOP)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect->ymax += U.pixelsize;
|
2013-11-21 14:43:08 +01:00
|
|
|
if (but->drawflag & UI_BUT_ALIGN_LEFT)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect->xmin -= U.pixelsize;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2013-11-21 14:43:08 +01:00
|
|
|
switch (but->drawflag & UI_BUT_ALIGN) {
|
2009-03-25 16:58:42 +00:00
|
|
|
case UI_BUT_ALIGN_TOP:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT;
|
|
|
|
break;
|
2009-03-25 16:58:42 +00:00
|
|
|
case UI_BUT_ALIGN_DOWN:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT;
|
|
|
|
break;
|
2009-03-25 16:58:42 +00:00
|
|
|
case UI_BUT_ALIGN_LEFT:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT;
|
|
|
|
break;
|
2009-03-25 16:58:42 +00:00
|
|
|
case UI_BUT_ALIGN_RIGHT:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT;
|
|
|
|
break;
|
2011-09-09 13:10:18 +00:00
|
|
|
case UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_RIGHT:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_TOP_LEFT;
|
|
|
|
break;
|
2011-09-09 13:10:18 +00:00
|
|
|
case UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_LEFT:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_TOP_RIGHT;
|
|
|
|
break;
|
2011-09-09 13:10:18 +00:00
|
|
|
case UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_RIGHT:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_BOTTOM_LEFT;
|
|
|
|
break;
|
2011-09-09 13:10:18 +00:00
|
|
|
case UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = UI_CNR_BOTTOM_RIGHT;
|
|
|
|
break;
|
2009-03-25 16:58:42 +00:00
|
|
|
default:
|
2012-10-04 20:12:05 +00:00
|
|
|
roundbox = 0;
|
|
|
|
break;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
2011-09-09 13:10:18 +00:00
|
|
|
}
|
|
|
|
|
2012-10-04 20:12:05 +00:00
|
|
|
/* align with open menu */
|
|
|
|
if (but->active) {
|
|
|
|
int direction = ui_button_open_menu_direction(but);
|
|
|
|
|
2012-10-10 23:44:07 +00:00
|
|
|
if (direction == UI_TOP) roundbox &= ~(UI_CNR_TOP_RIGHT | UI_CNR_TOP_LEFT);
|
|
|
|
else if (direction == UI_DOWN) roundbox &= ~(UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT);
|
|
|
|
else if (direction == UI_LEFT) roundbox &= ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
|
|
|
|
else if (direction == UI_RIGHT) roundbox &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
|
2012-10-04 20:12:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return roundbox;
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2013-03-18 18:29:22 +00:00
|
|
|
/* put all widget colors on half alpha, use local storage */
|
|
|
|
static void ui_widget_color_disabled(uiWidgetType *wt)
|
|
|
|
{
|
|
|
|
static uiWidgetColors wcol_theme_s;
|
|
|
|
|
|
|
|
wcol_theme_s = *wt->wcol_theme;
|
|
|
|
|
|
|
|
wcol_theme_s.outline[3] *= 0.5;
|
|
|
|
wcol_theme_s.inner[3] *= 0.5;
|
|
|
|
wcol_theme_s.inner_sel[3] *= 0.5;
|
|
|
|
wcol_theme_s.item[3] *= 0.5;
|
|
|
|
wcol_theme_s.text[3] *= 0.5;
|
|
|
|
wcol_theme_s.text_sel[3] *= 0.5;
|
|
|
|
|
|
|
|
wt->wcol_theme = &wcol_theme_s;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
bTheme *btheme = UI_GetTheme();
|
|
|
|
ThemeUI *tui = &btheme->tui;
|
|
|
|
uiFontStyle *fstyle = &style->widget;
|
|
|
|
uiWidgetType *wt = NULL;
|
2011-06-14 01:04:11 +00:00
|
|
|
|
2009-11-02 17:25:15 +00:00
|
|
|
/* handle menus separately */
|
2012-03-30 01:51:25 +00:00
|
|
|
if (but->dt == UI_EMBOSSP) {
|
2009-04-03 16:26:03 +00:00
|
|
|
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;
|
2014-01-17 00:23:00 +01:00
|
|
|
case SEPRLINE:
|
2010-10-16 02:40:31 +00:00
|
|
|
ui_draw_separator(rect, &tui->wcol_menu_item);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
|
|
|
default:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_MENU_ITEM);
|
2013-07-21 08:16:37 +00:00
|
|
|
break;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-30 01:51:25 +00:00
|
|
|
else if (but->dt == UI_EMBOSSN) {
|
2009-04-03 16:26:03 +00:00
|
|
|
/* "nothing" */
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_ICON);
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
switch (but->type) {
|
|
|
|
case LABEL:
|
2012-03-24 06:38:07 +00:00
|
|
|
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 {
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_LABEL);
|
|
|
|
fstyle = &style->widgetlabel;
|
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
|
|
|
break;
|
Fix [#35750] list items in properties editor (text colors not following list item theme).
Issue goes back since we stopped using LISTROW button to draw item's name (i.e. since we have custom buttons in list items!).
This commit:
* Adds a new flag to uiBlock, UI_BLOCK_LIST_ITEM, to mark blocks used for each list item.
* Adds a new button type, LISTLABEL, which basically behaves exactly as LABEL, but uses wcol_list_item color set.
* When uiItemL is called, it checks whether current block has UI_BLOCK_LIST_ITEM set, and if so, switch produced button to LISTLABEL type.
* Adds a new helper func, ui_layout_list_set_labels_active, called after the active list item has been "drawn", to set all LISTLABEL buttons as UI_SELECT.
Note custom widget_state_label() was removed, in interface_widgets.c, as it did nothing more than default widget_state().
Thanks to Brecht for the review and advices.
2013-06-26 07:28:55 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case SEPR:
|
2014-01-17 00:23:00 +01:00
|
|
|
case SEPRLINE:
|
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 BUT:
|
2012-03-30 01:51:25 +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:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_NUMBER);
|
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 NUMSLI:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_SLIDER);
|
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 ROW:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_RADIO);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-07-21 01:26:17 +00:00
|
|
|
|
|
|
|
case LISTROW:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_LISTITEM);
|
2009-07-21 01:26:17 +00:00
|
|
|
break;
|
2009-06-12 14:22:27 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case TEX:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_NAME);
|
2009-06-10 11:43:21 +00:00
|
|
|
break;
|
2013-01-09 15:58:34 +00:00
|
|
|
|
|
|
|
case SEARCH_MENU_UNLINK:
|
2009-06-02 18:10:06 +00:00
|
|
|
case SEARCH_MENU:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_NAME);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->block->flag & UI_BLOCK_LOOP)
|
2012-03-30 01:51:25 +00:00
|
|
|
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:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_TOGGLE);
|
2009-05-27 00:03:49 +00:00
|
|
|
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)) {
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_OPTION);
|
2013-11-21 14:43:08 +01:00
|
|
|
but->drawflag |= UI_BUT_TEXT_LEFT;
|
2009-04-09 18:11:18 +00:00
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
else
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_TOGGLE);
|
2011-04-04 15:01:22 +00:00
|
|
|
|
|
|
|
/* option buttons have strings outside, on menus use different colors */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->block->flag & UI_BLOCK_LOOP)
|
2012-03-30 01:51:25 +00:00
|
|
|
wt->state = widget_state_option_menu;
|
2011-04-04 15:01:22 +00:00
|
|
|
|
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 MENU:
|
|
|
|
case BLOCK:
|
2012-05-22 15:50:13 +00:00
|
|
|
/* new node-link button, not active yet XXX */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->flag & UI_BUT_NODE_LINK)
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_MENU_NODE_LINK);
|
2012-05-22 15:50:13 +00:00
|
|
|
|
|
|
|
/* no text, with icon */
|
|
|
|
else if (!but->str[0] && but->icon) {
|
2012-05-23 14:24:40 +00:00
|
|
|
if (but->drawflag & UI_BUT_DRAW_ENUM_ARROWS)
|
2012-05-22 16:24:09 +00:00
|
|
|
wt = widget_type(UI_WTYPE_MENU_RADIO); /* with arrows */
|
2012-05-23 14:24:40 +00:00
|
|
|
else
|
2012-06-05 21:54:21 +00:00
|
|
|
wt = widget_type(UI_WTYPE_MENU_ICON_RADIO); /* no arrows */
|
2012-05-22 15:50:13 +00:00
|
|
|
}
|
|
|
|
/* with menu arrows */
|
2009-09-28 15:59:09 +00:00
|
|
|
else
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_MENU_RADIO);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PULLDOWN:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_PULLDOWN);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-03-25 16:58:42 +00:00
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
case BUTM:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_MENU_ITEM);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
|
|
|
|
2012-09-11 23:10:23 +00:00
|
|
|
case COLOR:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_SWATCH);
|
2009-04-03 16:26:03 +00:00
|
|
|
break;
|
2009-06-01 11:31:06 +00:00
|
|
|
|
|
|
|
case ROUNDBOX:
|
2009-07-21 01:26:17 +00:00
|
|
|
case LISTBOX:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_BOX);
|
2009-06-01 11:31:06 +00:00
|
|
|
break;
|
2009-06-17 11:01:05 +00:00
|
|
|
|
|
|
|
case LINK:
|
|
|
|
case INLINK:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_ICON);
|
|
|
|
wt->custom = widget_link;
|
2009-06-17 11:01:05 +00:00
|
|
|
|
|
|
|
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:
|
2012-08-19 10:41:27 +00:00
|
|
|
if (but->a1 == UI_GRAD_V_ALT) { /* vertical V slider, uses new widget draw now */
|
2009-06-12 14:22:27 +00:00
|
|
|
ui_draw_but_HSV_v(but, rect);
|
2012-08-19 10:41:27 +00:00
|
|
|
}
|
|
|
|
else { /* other HSV pickers... */
|
2009-06-12 14:22:27 +00:00
|
|
|
ui_draw_but_HSVCUBE(but, rect);
|
2012-08-19 10:41:27 +00:00
|
|
|
}
|
2009-06-12 14:22:27 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HSVCIRCLE:
|
2010-01-07 09:55:11 +00:00
|
|
|
ui_draw_but_HSVCIRCLE(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_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:
|
2012-11-17 16:11:02 +00:00
|
|
|
wt = widget_type(UI_WTYPE_NORMAL);
|
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;
|
2010-01-19 01:32:06 +00:00
|
|
|
|
|
|
|
case HISTOGRAM:
|
2010-01-28 07:26:21 +00:00
|
|
|
ui_draw_but_HISTOGRAM(ar, but, &tui->wcol_regular, rect);
|
2010-01-19 01:32:06 +00:00
|
|
|
break;
|
2009-11-23 13:58:55 +00:00
|
|
|
|
2010-04-06 02:05:54 +00:00
|
|
|
case WAVEFORM:
|
|
|
|
ui_draw_but_WAVEFORM(ar, but, &tui->wcol_regular, rect);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VECTORSCOPE:
|
|
|
|
ui_draw_but_VECTORSCOPE(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;
|
2010-05-27 08:22:16 +00:00
|
|
|
|
|
|
|
case PROGRESSBAR:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_PROGRESSBAR);
|
|
|
|
fstyle = &style->widgetlabel;
|
2010-05-27 08:22:16 +00:00
|
|
|
break;
|
2009-06-24 14:16:56 +00:00
|
|
|
|
|
|
|
case SCROLL:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_SCROLL);
|
2009-06-24 14:16:56 +00:00
|
|
|
break;
|
|
|
|
|
2011-11-07 12:55:18 +00:00
|
|
|
case TRACKPREVIEW:
|
|
|
|
ui_draw_but_TRACKPREVIEW(ar, but, &tui->wcol_regular, rect);
|
|
|
|
break;
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
case NODESOCKET:
|
|
|
|
ui_draw_but_NODESOCKET(ar, but, &tui->wcol_regular, rect);
|
|
|
|
break;
|
|
|
|
|
2009-04-03 16:26:03 +00:00
|
|
|
default:
|
2012-03-30 01:51:25 +00:00
|
|
|
wt = widget_type(UI_WTYPE_REGULAR);
|
2013-07-21 08:16:37 +00:00
|
|
|
break;
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
2009-03-25 16:58:42 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wt) {
|
2013-03-18 18:29:22 +00:00
|
|
|
//rcti disablerect = *rect; /* rect gets clipped smaller for text */
|
2009-04-02 15:01:11 +00:00
|
|
|
int roundboxalign, state;
|
2013-05-29 11:49:39 +00:00
|
|
|
bool disabled = false;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
roundboxalign = widget_roundbox_set(but, rect);
|
2009-06-24 14:16:56 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
state = but->flag;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (but->editstr) state |= UI_TEXTINPUT;
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2013-03-18 18:29:22 +00:00
|
|
|
if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE))
|
|
|
|
if (but->dt != UI_EMBOSSP)
|
2013-05-29 11:49:39 +00:00
|
|
|
disabled = true;
|
2013-03-18 18:29:22 +00:00
|
|
|
|
|
|
|
if (disabled)
|
|
|
|
ui_widget_color_disabled(wt);
|
|
|
|
|
2009-04-02 15:01:11 +00:00
|
|
|
wt->state(wt, state);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wt->custom)
|
2009-04-09 18:11:18 +00:00
|
|
|
wt->custom(but, &wt->wcol, rect, state, roundboxalign);
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (wt->draw)
|
2009-04-09 18:11:18 +00:00
|
|
|
wt->draw(&wt->wcol, rect, state, roundboxalign);
|
2013-03-18 18:29:22 +00:00
|
|
|
|
|
|
|
if (disabled)
|
|
|
|
glEnable(GL_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
|
|
|
wt->text(fstyle, &wt->wcol, but, rect);
|
2013-03-18 18:29:22 +00:00
|
|
|
if (disabled)
|
|
|
|
glDisable(GL_BLEND);
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2013-03-18 18:29:22 +00:00
|
|
|
// if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE))
|
|
|
|
// if (but->dt != UI_EMBOSSP)
|
|
|
|
// widget_disabled(&disablerect);
|
2009-04-02 15:01:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
void ui_draw_menu_back(uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
|
2009-04-03 16:26:03 +00:00
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK);
|
2009-04-03 16:26:03 +00:00
|
|
|
|
|
|
|
wt->state(wt, 0);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (block)
|
2009-04-15 14:43:54 +00:00
|
|
|
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
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (block) {
|
|
|
|
if (block->flag & UI_BLOCK_CLIPTOP) {
|
Code holiday commit:
- fix: user pref, window title was reset to 'Blender' on tab usage
- Undo history menu back:
- name "Undo History"
- hotkey alt+ctrl+z (alt+apple+z for mac)
- works like 2.4x, only for global undo, editmode and particle edit.
- Menu scroll
- for small windows or screens, popup menus now allow to display
all items, using internal scrolling
- works with a timer, scrolling 10 items per second when mouse
is over the top or bottom arrow
- if menu is too big to display, it now draws to top or bottom,
based on largest available space.
- also works for hotkey driven pop up menus.
- User pref "DPI" follows widget/layout size
- widgets & headers now become bigger and smaller, to match
'dpi' font sizes. Works well to match UI to monitor size.
- note that icons can get fuzzy, we need better mipmaps for it
2011-06-04 17:03:46 +00:00
|
|
|
/* XXX no scaling for UI here yet */
|
2012-03-30 01:51:25 +00:00
|
|
|
glColor3ubv((unsigned char *)wt->wcol.text);
|
2012-09-15 11:48:20 +00:00
|
|
|
UI_DrawTriIcon(BLI_rcti_cent_x(rect), rect->ymax - 8, 't');
|
Code holiday commit:
- fix: user pref, window title was reset to 'Blender' on tab usage
- Undo history menu back:
- name "Undo History"
- hotkey alt+ctrl+z (alt+apple+z for mac)
- works like 2.4x, only for global undo, editmode and particle edit.
- Menu scroll
- for small windows or screens, popup menus now allow to display
all items, using internal scrolling
- works with a timer, scrolling 10 items per second when mouse
is over the top or bottom arrow
- if menu is too big to display, it now draws to top or bottom,
based on largest available space.
- also works for hotkey driven pop up menus.
- User pref "DPI" follows widget/layout size
- widgets & headers now become bigger and smaller, to match
'dpi' font sizes. Works well to match UI to monitor size.
- note that icons can get fuzzy, we need better mipmaps for it
2011-06-04 17:03:46 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (block->flag & UI_BLOCK_CLIPBOTTOM) {
|
Code holiday commit:
- fix: user pref, window title was reset to 'Blender' on tab usage
- Undo history menu back:
- name "Undo History"
- hotkey alt+ctrl+z (alt+apple+z for mac)
- works like 2.4x, only for global undo, editmode and particle edit.
- Menu scroll
- for small windows or screens, popup menus now allow to display
all items, using internal scrolling
- works with a timer, scrolling 10 items per second when mouse
is over the top or bottom arrow
- if menu is too big to display, it now draws to top or bottom,
based on largest available space.
- also works for hotkey driven pop up menus.
- User pref "DPI" follows widget/layout size
- widgets & headers now become bigger and smaller, to match
'dpi' font sizes. Works well to match UI to monitor size.
- note that icons can get fuzzy, we need better mipmaps for it
2011-06-04 17:03:46 +00:00
|
|
|
/* XXX no scaling for UI here yet */
|
2012-03-30 01:51:25 +00:00
|
|
|
glColor3ubv((unsigned char *)wt->wcol.text);
|
2012-09-15 11:48:20 +00:00
|
|
|
UI_DrawTriIcon(BLI_rcti_cent_x(rect), rect->ymin + 10, 'v');
|
Code holiday commit:
- fix: user pref, window title was reset to 'Blender' on tab usage
- Undo history menu back:
- name "Undo History"
- hotkey alt+ctrl+z (alt+apple+z for mac)
- works like 2.4x, only for global undo, editmode and particle edit.
- Menu scroll
- for small windows or screens, popup menus now allow to display
all items, using internal scrolling
- works with a timer, scrolling 10 items per second when mouse
is over the top or bottom arrow
- if menu is too big to display, it now draws to top or bottom,
based on largest available space.
- also works for hotkey driven pop up menus.
- User pref "DPI" follows widget/layout size
- widgets & headers now become bigger and smaller, to match
'dpi' font sizes. Works well to match UI to monitor size.
- note that icons can get fuzzy, we need better mipmaps for it
2011-06-04 17:03:46 +00:00
|
|
|
}
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-04-03 16:26:03 +00:00
|
|
|
}
|
2009-04-02 15:01:11 +00:00
|
|
|
|
2012-04-24 22:50:49 +00:00
|
|
|
uiWidgetColors *ui_tooltip_get_theme(void)
|
|
|
|
{
|
2012-03-22 20:24:11 +00:00
|
|
|
uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
|
|
|
|
return wt->wcol_theme;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ui_draw_tooltip_background(uiStyle *UNUSED(style), uiBlock *UNUSED(block), rcti *rect)
|
2012-03-19 22:29:16 +00:00
|
|
|
{
|
|
|
|
uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
|
|
|
|
wt->state(wt, 0);
|
|
|
|
/* wt->draw ends up using same function to draw the tooltip as menu_back */
|
|
|
|
wt->draw(&wt->wcol, rect, 0, 0);
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
void ui_draw_search_back(uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
|
2009-06-03 18:31:37 +00:00
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
uiWidgetType *wt = widget_type(UI_WTYPE_BOX);
|
2009-06-03 18:31:37 +00:00
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
2012-12-20 16:50:39 +00:00
|
|
|
widget_softshadow(rect, UI_CNR_ALL, 0.25f * U.widget_unit);
|
2009-06-03 18:31:37 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
|
|
|
wt->state(wt, 0);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (block)
|
2011-09-11 06:41:09 +00:00
|
|
|
wt->draw(&wt->wcol, rect, block->flag, UI_CNR_ALL);
|
2009-06-03 18:31:37 +00:00
|
|
|
else
|
2011-09-11 06:41:09 +00:00
|
|
|
wt->draw(&wt->wcol, rect, 0, UI_CNR_ALL);
|
2009-06-03 18:31:37 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-02 18:10:06 +00:00
|
|
|
/* helper call to draw a menu item without button */
|
|
|
|
/* state: UI_ACTIVE or 0 */
|
2013-09-11 04:56:35 +00:00
|
|
|
void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state, bool use_sep)
|
2009-06-02 18:10:06 +00:00
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
uiWidgetType *wt = widget_type(UI_WTYPE_MENU_ITEM);
|
|
|
|
rcti _rect = *rect;
|
2009-06-02 18:10:06 +00:00
|
|
|
char *cpoin;
|
2013-01-17 01:48:42 +00:00
|
|
|
|
2009-06-02 18:10:06 +00:00
|
|
|
wt->state(wt, state);
|
|
|
|
wt->draw(&wt->wcol, rect, 0, 0);
|
|
|
|
|
|
|
|
uiStyleFontSet(fstyle);
|
2012-03-30 01:51:25 +00:00
|
|
|
fstyle->align = UI_STYLE_TEXT_LEFT;
|
2009-06-02 18:10:06 +00:00
|
|
|
|
|
|
|
/* text location offset */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rect->xmin += 0.25f * UI_UNIT_X;
|
2012-03-30 01:51:25 +00:00
|
|
|
if (iconid) rect->xmin += UI_DPI_ICON_SIZE;
|
2009-06-02 18:10:06 +00:00
|
|
|
|
|
|
|
/* cut string in 2 parts? */
|
2013-09-11 04:56:35 +00:00
|
|
|
if (use_sep) {
|
2013-09-11 05:06:27 +00:00
|
|
|
cpoin = strchr(name, UI_SEP_CHAR);
|
2013-09-11 04:56:35 +00:00
|
|
|
if (cpoin) {
|
|
|
|
*cpoin = 0;
|
2013-12-02 20:33:45 +11:00
|
|
|
rect->xmax -= BLF_width(fstyle->uifont_id, cpoin + 1, INT_MAX) + 10;
|
2013-09-11 04:56:35 +00:00
|
|
|
}
|
2009-06-03 18:31:37 +00:00
|
|
|
}
|
2009-06-02 18:10:06 +00:00
|
|
|
|
2013-03-18 18:29:22 +00:00
|
|
|
glColor4ubv((unsigned char *)wt->wcol.text);
|
2009-06-02 18:10:06 +00:00
|
|
|
uiStyleFontDraw(fstyle, rect, name);
|
|
|
|
|
|
|
|
/* part text right aligned */
|
2013-09-11 04:56:35 +00:00
|
|
|
if (use_sep) {
|
|
|
|
if (cpoin) {
|
|
|
|
fstyle->align = UI_STYLE_TEXT_RIGHT;
|
|
|
|
rect->xmax = _rect.xmax - 5;
|
|
|
|
uiStyleFontDraw(fstyle, rect, cpoin + 1);
|
2013-09-11 05:06:27 +00:00
|
|
|
*cpoin = UI_SEP_CHAR;
|
2013-09-11 04:56:35 +00:00
|
|
|
}
|
2009-06-02 18:10:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* restore rect, was messed with */
|
2012-03-30 01:51:25 +00:00
|
|
|
*rect = _rect;
|
2009-06-02 18:10:06 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (iconid) {
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
float height, aspect;
|
|
|
|
int xs = rect->xmin + 0.2f * UI_UNIT_X;
|
2012-12-23 13:02:38 +00:00
|
|
|
int ys = rect->ymin + 0.1f * BLI_rcti_size_y(rect);
|
2013-12-18 17:11:38 +11:00
|
|
|
|
|
|
|
height = ICON_SIZE_FROM_BUTRECT(rect);
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
aspect = ICON_DEFAULT_HEIGHT / height;
|
2012-12-23 13:02:38 +00:00
|
|
|
|
2009-06-24 16:44:54 +00:00
|
|
|
glEnable(GL_BLEND);
|
2012-12-23 13:02:38 +00:00
|
|
|
UI_icon_draw_aspect(xs, ys, iconid, aspect, 1.0f); /* 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
|
|
|
|
2011-02-07 22:48:23 +00:00
|
|
|
void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state)
|
2010-01-03 08:37:18 +00:00
|
|
|
{
|
2012-02-28 20:46:55 +00:00
|
|
|
rcti trect = *rect, bg_rect;
|
2012-01-11 05:45:39 +00:00
|
|
|
float font_dims[2] = {0.0f, 0.0f};
|
2012-03-30 01:51:25 +00:00
|
|
|
uiWidgetType *wt = widget_type(UI_WTYPE_MENU_ITEM);
|
2010-01-03 08:37:18 +00:00
|
|
|
|
|
|
|
wt->state(wt, state);
|
|
|
|
wt->draw(&wt->wcol, rect, 0, 0);
|
|
|
|
|
2011-01-20 16:29:43 +00:00
|
|
|
widget_draw_preview(iconid, 1.0f, rect);
|
2010-01-03 08:37:18 +00:00
|
|
|
|
2013-12-02 20:33:45 +11:00
|
|
|
BLF_width_and_height(fstyle->uifont_id, name, BLF_DRAW_STR_DUMMY_MAX, &font_dims[0], &font_dims[1]);
|
2012-01-11 05:45:39 +00:00
|
|
|
|
2012-02-28 01:55:27 +00:00
|
|
|
/* text rect */
|
2010-01-03 08:37:18 +00:00
|
|
|
trect.xmin += 0;
|
2012-01-11 05:45:39 +00:00
|
|
|
trect.xmax = trect.xmin + font_dims[0] + 10;
|
2010-01-03 08:37:18 +00:00
|
|
|
trect.ymin += 10;
|
2012-01-11 05:45:39 +00:00
|
|
|
trect.ymax = trect.ymin + font_dims[1];
|
2012-03-24 06:38:07 +00:00
|
|
|
if (trect.xmax > rect->xmax - PREVIEW_PAD)
|
2012-02-28 01:55:27 +00:00
|
|
|
trect.xmax = rect->xmax - PREVIEW_PAD;
|
|
|
|
|
2012-02-28 20:46:55 +00:00
|
|
|
bg_rect = trect;
|
|
|
|
bg_rect.xmin = rect->xmin + PREVIEW_PAD;
|
|
|
|
bg_rect.ymin = rect->ymin + PREVIEW_PAD;
|
2012-03-15 21:11:14 +00:00
|
|
|
bg_rect.xmax = rect->xmax - PREVIEW_PAD;
|
2012-02-28 20:46:55 +00:00
|
|
|
bg_rect.ymax += PREVIEW_PAD / 2;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (bg_rect.xmax > rect->xmax - PREVIEW_PAD)
|
2012-02-28 20:46:55 +00:00
|
|
|
bg_rect.xmax = rect->xmax - PREVIEW_PAD;
|
|
|
|
|
2013-03-24 18:59:15 +00:00
|
|
|
glColor4ubv((unsigned char *)wt->wcol_theme->inner_sel);
|
2012-03-15 21:11:14 +00:00
|
|
|
glEnable(GL_BLEND);
|
2012-02-28 20:46:55 +00:00
|
|
|
glRecti(bg_rect.xmin, bg_rect.ymin, bg_rect.xmax, bg_rect.ymax);
|
2012-03-15 21:11:14 +00:00
|
|
|
glDisable(GL_BLEND);
|
2012-02-28 20:46:55 +00:00
|
|
|
|
2013-03-24 18:59:15 +00:00
|
|
|
glColor3ubv((unsigned char *)wt->wcol.text);
|
2012-02-28 20:46:55 +00:00
|
|
|
|
2010-01-03 08:37:18 +00:00
|
|
|
uiStyleFontDraw(fstyle, &trect, name);
|
|
|
|
}
|