2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2009-02-04 11:52:16 +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
|
2018-05-23 10:47:12 +02:00
|
|
|
* of the License, or (at your option) any later version.
|
2009-02-04 11:52:16 +00:00
|
|
|
*
|
|
|
|
* 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-02-04 11:52:16 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*/
|
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
* \ingroup edinterface
|
2011-02-27 20:29:51 +00:00
|
|
|
*/
|
|
|
|
|
2020-05-06 15:51:23 +10:00
|
|
|
#include <ctype.h>
|
2009-09-16 19:36:17 +00:00
|
|
|
#include <stdio.h>
|
2009-02-04 11:52:16 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
|
|
|
#include "DNA_object_types.h"
|
2014-02-08 09:03:25 +11:00
|
|
|
#include "DNA_screen_types.h"
|
2009-06-10 11:43:21 +00:00
|
|
|
|
2021-07-13 17:06:15 +02:00
|
|
|
#include "ED_screen.h"
|
|
|
|
|
2020-07-07 10:08:42 +02:00
|
|
|
#include "BLI_alloca.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_listbase.h"
|
2014-01-08 17:04:10 +01:00
|
|
|
#include "BLI_math.h"
|
2011-09-26 16:53:04 +00:00
|
|
|
#include "BLI_string.h"
|
2021-02-19 17:56:24 +01:00
|
|
|
#include "BLI_string_search.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_utildefines.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2011-06-15 11:41:15 +00:00
|
|
|
|
2021-07-13 17:06:15 +02:00
|
|
|
#include "BKE_context.h"
|
2020-04-10 20:07:11 +02:00
|
|
|
#include "BKE_lib_id.h"
|
2014-02-09 12:00:03 +11:00
|
|
|
#include "BKE_report.h"
|
2011-01-07 19:18:31 +00:00
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
#include "MEM_guardedalloc.h"
|
2009-02-04 11:52:16 +00:00
|
|
|
|
|
|
|
#include "RNA_access.h"
|
|
|
|
|
|
|
|
#include "UI_interface.h"
|
2020-06-29 17:19:43 +02:00
|
|
|
#include "UI_interface_icons.h"
|
2009-02-04 11:52:16 +00:00
|
|
|
#include "UI_resources.h"
|
2021-07-13 17:06:15 +02:00
|
|
|
#include "UI_view2d.h"
|
2009-02-04 11:52:16 +00:00
|
|
|
|
2015-04-27 01:17:51 +10:00
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
#include "interface_intern.h"
|
|
|
|
|
2009-02-04 11:52:16 +00:00
|
|
|
/*************************** RNA Utilities ******************************/
|
|
|
|
|
2010-12-03 17:05:21 +00:00
|
|
|
uiBut *uiDefAutoButR(uiBlock *block,
|
|
|
|
PointerRNA *ptr,
|
|
|
|
PropertyRNA *prop,
|
|
|
|
int index,
|
|
|
|
const char *name,
|
|
|
|
int icon,
|
2021-03-19 20:22:37 +01:00
|
|
|
int x,
|
|
|
|
int y,
|
|
|
|
int width,
|
|
|
|
int height)
|
2009-02-04 11:52:16 +00:00
|
|
|
{
|
2012-03-30 01:51:25 +00:00
|
|
|
uiBut *but = NULL;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
switch (RNA_property_type(prop)) {
|
2011-08-06 16:00:00 +00:00
|
|
|
case PROP_BOOLEAN: {
|
2019-03-25 10:15:20 +11:00
|
|
|
if (RNA_property_array_check(prop) && index == -1) {
|
2009-02-04 11:52:16 +00:00
|
|
|
return NULL;
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-25 10:15:20 +11:00
|
|
|
if (icon && name && name[0] == '\0') {
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefIconButR_prop(block,
|
|
|
|
UI_BTYPE_ICON_TOGGLE,
|
|
|
|
0,
|
|
|
|
icon,
|
2021-03-19 20:22:37 +01:00
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
2014-11-09 21:20:40 +01:00
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
|
|
|
else if (icon) {
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefIconTextButR_prop(block,
|
|
|
|
UI_BTYPE_ICON_TOGGLE,
|
|
|
|
0,
|
|
|
|
icon,
|
|
|
|
name,
|
2021-03-19 20:22:37 +01:00
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
2014-11-09 21:20:40 +01:00
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
|
|
|
else {
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefButR_prop(block,
|
|
|
|
UI_BTYPE_CHECKBOX,
|
|
|
|
0,
|
|
|
|
name,
|
2021-03-19 20:22:37 +01:00
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
2014-11-09 21:20:40 +01:00
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
2019-04-17 06:17:24 +02:00
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
2009-02-04 11:52:16 +00:00
|
|
|
NULL);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
break;
|
|
|
|
}
|
2009-02-04 11:52:16 +00:00
|
|
|
case PROP_INT:
|
|
|
|
case PROP_FLOAT: {
|
2019-03-18 19:56:14 +01:00
|
|
|
if (RNA_property_array_check(prop) && index == -1) {
|
2014-12-30 07:37:59 +11:00
|
|
|
if (ELEM(RNA_property_subtype(prop), PROP_COLOR, PROP_COLOR_GAMMA)) {
|
2021-03-19 20:22:37 +01:00
|
|
|
but = uiDefButR_prop(block,
|
|
|
|
UI_BTYPE_COLOR,
|
|
|
|
0,
|
|
|
|
name,
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
-1,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
NULL);
|
2014-12-30 07:37:59 +11:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return NULL;
|
2009-02-04 11:52:16 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2019-03-25 10:15:20 +11:00
|
|
|
else if (RNA_property_subtype(prop) == PROP_PERCENTAGE ||
|
|
|
|
RNA_property_subtype(prop) == PROP_FACTOR) {
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefButR_prop(block,
|
|
|
|
UI_BTYPE_NUM_SLIDER,
|
|
|
|
0,
|
|
|
|
name,
|
2021-03-19 20:22:37 +01:00
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
2014-11-09 21:20:40 +01:00
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
2019-04-17 06:17:24 +02:00
|
|
|
NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
|
|
|
else {
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefButR_prop(
|
2021-03-19 20:22:37 +01:00
|
|
|
block, UI_BTYPE_NUM, 0, name, x, y, width, height, ptr, prop, index, 0, 0, 0, 0, NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-12-25 12:53:13 +01:00
|
|
|
if (RNA_property_flag(prop) & PROP_TEXTEDIT_UPDATE) {
|
|
|
|
UI_but_flag_enable(but, UI_BUT_TEXTEDIT_UPDATE);
|
|
|
|
}
|
2009-02-04 11:52:16 +00:00
|
|
|
break;
|
2011-08-06 16:00:00 +00:00
|
|
|
}
|
2009-02-04 11:52:16 +00:00
|
|
|
case PROP_ENUM:
|
2019-03-25 10:15:20 +11:00
|
|
|
if (icon && name && name[0] == '\0') {
|
2021-03-19 20:22:37 +01:00
|
|
|
but = uiDefIconButR_prop(block,
|
|
|
|
UI_BTYPE_MENU,
|
|
|
|
0,
|
|
|
|
icon,
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2019-03-25 10:15:20 +11:00
|
|
|
else if (icon) {
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefIconTextButR_prop(block,
|
|
|
|
UI_BTYPE_MENU,
|
2019-04-17 06:17:24 +02:00
|
|
|
0,
|
|
|
|
icon,
|
2014-11-09 21:20:40 +01:00
|
|
|
NULL,
|
2021-03-19 20:22:37 +01:00
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
2019-04-17 06:17:24 +02:00
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
|
|
|
else {
|
2021-03-19 20:22:37 +01:00
|
|
|
but = uiDefButR_prop(block,
|
|
|
|
UI_BTYPE_MENU,
|
|
|
|
0,
|
|
|
|
name,
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2009-02-04 11:52:16 +00:00
|
|
|
break;
|
|
|
|
case PROP_STRING:
|
2019-03-25 10:15:20 +11:00
|
|
|
if (icon && name && name[0] == '\0') {
|
2021-03-19 20:22:37 +01:00
|
|
|
but = uiDefIconButR_prop(block,
|
|
|
|
UI_BTYPE_TEXT,
|
|
|
|
0,
|
|
|
|
icon,
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
|
|
|
else if (icon) {
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefIconTextButR_prop(block,
|
|
|
|
UI_BTYPE_TEXT,
|
|
|
|
0,
|
|
|
|
icon,
|
|
|
|
name,
|
2021-03-19 20:22:37 +01:00
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
2014-11-09 21:20:40 +01:00
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2018-09-27 15:35:22 +02:00
|
|
|
else {
|
2021-03-19 20:22:37 +01:00
|
|
|
but = uiDefButR_prop(block,
|
|
|
|
UI_BTYPE_TEXT,
|
|
|
|
0,
|
|
|
|
name,
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
2014-12-25 12:53:13 +01:00
|
|
|
if (RNA_property_flag(prop) & PROP_TEXTEDIT_UPDATE) {
|
2018-09-27 15:35:22 +02:00
|
|
|
/* TEXTEDIT_UPDATE is usually used for search buttons. For these we also want
|
2017-01-11 22:11:13 +01:00
|
|
|
* the 'x' icon to clear search string, so setting VALUE_CLEAR flag, too. */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_but_flag_enable(but, UI_BUT_TEXTEDIT_UPDATE | UI_BUT_VALUE_CLEAR);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
break;
|
2012-09-08 08:59:47 +00:00
|
|
|
case PROP_POINTER: {
|
2017-03-31 12:13:34 +02:00
|
|
|
if (icon == 0) {
|
2020-08-26 10:11:13 +10:00
|
|
|
const PointerRNA pptr = RNA_property_pointer_get(ptr, prop);
|
2014-11-09 21:20:40 +01:00
|
|
|
icon = RNA_struct_ui_icon(pptr.type ? pptr.type : RNA_property_pointer_type(ptr, prop));
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2019-03-25 10:15:20 +11:00
|
|
|
if (icon == ICON_DOT) {
|
2012-03-30 01:51:25 +00:00
|
|
|
icon = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
but = uiDefIconTextButR_prop(block,
|
|
|
|
UI_BTYPE_SEARCH_MENU,
|
2019-04-17 06:17:24 +02:00
|
|
|
0,
|
2014-11-09 21:20:40 +01:00
|
|
|
icon,
|
2019-04-17 06:17:24 +02:00
|
|
|
name,
|
2021-03-19 20:22:37 +01:00
|
|
|
x,
|
|
|
|
y,
|
|
|
|
width,
|
|
|
|
height,
|
2019-04-17 06:17:24 +02:00
|
|
|
ptr,
|
|
|
|
prop,
|
|
|
|
index,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
-1,
|
|
|
|
-1,
|
|
|
|
NULL);
|
2009-02-04 11:52:16 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-09-08 08:59:47 +00:00
|
|
|
case PROP_COLLECTION: {
|
2009-02-04 11:52:16 +00:00
|
|
|
char text[256];
|
2011-10-20 20:38:26 +00:00
|
|
|
BLI_snprintf(
|
|
|
|
text, sizeof(text), IFACE_("%d items"), RNA_property_collection_length(ptr, prop));
|
2021-03-19 20:22:37 +01:00
|
|
|
but = uiDefBut(block, UI_BTYPE_LABEL, 0, text, x, y, width, height, NULL, 0, 0, 0, 0, NULL);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_but_flag_enable(but, UI_BUT_DISABLED);
|
2009-02-04 11:52:16 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
2012-03-30 01:51:25 +00:00
|
|
|
but = NULL;
|
2009-02-04 11:52:16 +00:00
|
|
|
break;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-02-04 11:52:16 +00:00
|
|
|
return but;
|
|
|
|
}
|
|
|
|
|
2012-06-14 22:48:40 +00:00
|
|
|
/**
|
|
|
|
* \a check_prop callback filters functions to avoid drawing certain properties,
|
|
|
|
* in cases where PROP_HIDDEN flag can't be used for a property.
|
2019-03-22 00:30:17 +11:00
|
|
|
*
|
|
|
|
* \param prop_activate_init: Property to activate on initial popup (#UI_BUT_ACTIVATE_ON_INIT).
|
2012-06-14 22:48:40 +00:00
|
|
|
*/
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
eAutoPropButsReturn uiDefAutoButsRNA(uiLayout *layout,
|
2015-05-05 03:13:47 +10:00
|
|
|
PointerRNA *ptr,
|
2018-07-26 09:59:56 +10:00
|
|
|
bool (*check_prop)(PointerRNA *ptr,
|
|
|
|
PropertyRNA *prop,
|
|
|
|
void *user_data),
|
|
|
|
void *user_data,
|
2019-03-22 00:30:17 +11:00
|
|
|
PropertyRNA *prop_activate_init,
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
const eButLabelAlign label_align,
|
|
|
|
const bool compact)
|
2009-02-04 11:52:16 +00:00
|
|
|
{
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
eAutoPropButsReturn return_info = UI_PROP_BUTS_NONE_ADDED;
|
UI: Better split layout support for checkboxes
Makes the following layout changes possible:
{F8473498} {F8473499} {F8473502}
The next commit will contain many layout changes to make good use of
these new possibilities. The result should be more consistent, easier to
read and should give a more organized impression. Additionally, it
should be possible to replace many sub-panels with compacter layouts.
Main changes:
* Checkboxes now respect the property split layouts
* Add support for row and column headers (i.e.
`uiLayout.column(heading="Foo")`, `uiLayout.row(heading="Bar")`). If the
first property added to this layout doesn't insert anything into the label
split column, the heading is inserted there. Otherwise, it's inserted as own
item.
* Add support for manually inserting decorators for an existing item
(`uiLayout.prop_decorator()`). That way layout creators can manually insert
this, which was the only way I saw to support property split layouts with a
checkbox before the actual property. {F8471883}
* Autogenerated layouts for operator properties look bad if there are only
checkboxes (which only use half the region width). So before creating the
layout, we iterate over visible properties and disable split layout if all
are booleans. I think this is fine, if needed we could also add layout hints
to operators.
* `uiTemplateOperatorPropertyButs()` now handles macros itself, the caller
used to be responsible for this. Code that didn't handle these so far never
used macros I think, so this change should be invisible.
* Remove manual property split layout from autogenerated operator properties
layout.
* Padding of checkboxes is tweaked to make their label visually more connected
to the checkboxes.
* Support split layout for menus (should work for `uiLayout.menu()`,
`.operator_menu_enum()`, `.prop_menu_enum()`, maybe more)
Maniphest Task: https://developer.blender.org/T65965
Differential Revision: https://developer.blender.org/D7427
Reviewed by: Brecht Van Lommel, William Reynish, Pablo Vazques
2020-04-17 16:40:25 +02:00
|
|
|
uiLayout *col;
|
2010-12-15 05:42:23 +00:00
|
|
|
const char *name;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-30 16:22:40 +00:00
|
|
|
RNA_STRUCT_BEGIN (ptr, prop) {
|
2019-03-22 00:30:17 +11:00
|
|
|
const int flag = RNA_property_flag(prop);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
if (flag & PROP_HIDDEN) {
|
|
|
|
continue;
|
|
|
|
}
|
2018-07-26 13:50:56 +10:00
|
|
|
if (check_prop && check_prop(ptr, prop, user_data) == 0) {
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
return_info |= UI_PROP_BUTS_ANY_FAILED_CHECK;
|
2009-02-04 11:52:16 +00:00
|
|
|
continue;
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-22 00:30:17 +11:00
|
|
|
const PropertyType type = RNA_property_type(prop);
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
switch (label_align) {
|
|
|
|
case UI_BUT_LABEL_ALIGN_COLUMN:
|
|
|
|
case UI_BUT_LABEL_ALIGN_SPLIT_COLUMN: {
|
|
|
|
const bool is_boolean = (type == PROP_BOOLEAN && !RNA_property_array_check(prop));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
name = RNA_property_ui_name(prop);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
if (label_align == UI_BUT_LABEL_ALIGN_COLUMN) {
|
|
|
|
col = uiLayoutColumn(layout, true);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-25 10:15:20 +11:00
|
|
|
if (!is_boolean) {
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
uiItemL(col, name, ICON_NONE);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_assert(label_align == UI_BUT_LABEL_ALIGN_SPLIT_COLUMN);
|
UI: Better split layout support for checkboxes
Makes the following layout changes possible:
{F8473498} {F8473499} {F8473502}
The next commit will contain many layout changes to make good use of
these new possibilities. The result should be more consistent, easier to
read and should give a more organized impression. Additionally, it
should be possible to replace many sub-panels with compacter layouts.
Main changes:
* Checkboxes now respect the property split layouts
* Add support for row and column headers (i.e.
`uiLayout.column(heading="Foo")`, `uiLayout.row(heading="Bar")`). If the
first property added to this layout doesn't insert anything into the label
split column, the heading is inserted there. Otherwise, it's inserted as own
item.
* Add support for manually inserting decorators for an existing item
(`uiLayout.prop_decorator()`). That way layout creators can manually insert
this, which was the only way I saw to support property split layouts with a
checkbox before the actual property. {F8471883}
* Autogenerated layouts for operator properties look bad if there are only
checkboxes (which only use half the region width). So before creating the
layout, we iterate over visible properties and disable split layout if all
are booleans. I think this is fine, if needed we could also add layout hints
to operators.
* `uiTemplateOperatorPropertyButs()` now handles macros itself, the caller
used to be responsible for this. Code that didn't handle these so far never
used macros I think, so this change should be invisible.
* Remove manual property split layout from autogenerated operator properties
layout.
* Padding of checkboxes is tweaked to make their label visually more connected
to the checkboxes.
* Support split layout for menus (should work for `uiLayout.menu()`,
`.operator_menu_enum()`, `.prop_menu_enum()`, maybe more)
Maniphest Task: https://developer.blender.org/T65965
Differential Revision: https://developer.blender.org/D7427
Reviewed by: Brecht Van Lommel, William Reynish, Pablo Vazques
2020-04-17 16:40:25 +02:00
|
|
|
col = uiLayoutColumn(layout, true);
|
|
|
|
/* Let uiItemFullR() create the split layout. */
|
|
|
|
uiLayoutSetPropSep(col, true);
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case UI_BUT_LABEL_ALIGN_NONE:
|
2018-05-02 10:32:01 +02:00
|
|
|
default:
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
col = layout;
|
|
|
|
name = NULL; /* no smart label alignment, show default name with button */
|
|
|
|
break;
|
2009-06-24 21:27:10 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-22 00:30:17 +11:00
|
|
|
/* Only buttons that can be edited as text. */
|
|
|
|
const bool use_activate_init = ((prop == prop_activate_init) &&
|
|
|
|
(ELEM(type, PROP_STRING, PROP_INT, PROP_FLOAT)));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-22 00:30:17 +11:00
|
|
|
if (use_activate_init) {
|
|
|
|
uiLayoutSetActivateInit(col, true);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
uiItemFullR(col, ptr, prop, -1, 0, compact ? UI_ITEM_R_COMPACT : 0, name, ICON_NONE);
|
|
|
|
return_info &= ~UI_PROP_BUTS_NONE_ADDED;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-22 00:30:17 +11:00
|
|
|
if (use_activate_init) {
|
|
|
|
uiLayoutSetActivateInit(col, false);
|
|
|
|
}
|
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-06-24 21:27:10 +00:00
|
|
|
RNA_STRUCT_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 17:14:03 +02:00
|
|
|
return return_info;
|
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
|
|
|
}
|
2017-05-13 19:48:04 +02:00
|
|
|
|
2017-05-12 01:42:42 +02:00
|
|
|
/* *** RNA collection search menu *** */
|
|
|
|
|
|
|
|
typedef struct CollItemSearch {
|
|
|
|
struct CollItemSearch *next, *prev;
|
2017-05-13 19:48:04 +02:00
|
|
|
void *data;
|
2017-05-12 01:42:42 +02:00
|
|
|
char *name;
|
|
|
|
int index;
|
|
|
|
int iconid;
|
2020-06-29 17:19:43 +02:00
|
|
|
bool is_id;
|
2020-07-23 17:24:17 +10:00
|
|
|
int name_prefix_offset;
|
2020-06-15 18:32:51 +10:00
|
|
|
uint has_sep_char : 1;
|
2017-05-12 01:42:42 +02:00
|
|
|
} CollItemSearch;
|
|
|
|
|
2021-02-19 17:56:24 +01:00
|
|
|
static bool add_collection_search_item(CollItemSearch *cis,
|
|
|
|
const bool requires_exact_data_name,
|
|
|
|
const bool has_id_icon,
|
|
|
|
uiSearchItems *items)
|
2017-05-12 01:42:42 +02:00
|
|
|
{
|
2021-02-19 17:56:24 +01:00
|
|
|
char name_buf[UI_MAX_DRAW_STR];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-02-19 17:56:24 +01:00
|
|
|
/* If no item has an own icon to display, libraries can use the library icons rather than the
|
|
|
|
* name prefix for showing the library status. */
|
|
|
|
int name_prefix_offset = cis->name_prefix_offset;
|
|
|
|
if (!has_id_icon && cis->is_id && !requires_exact_data_name) {
|
|
|
|
cis->iconid = UI_icon_from_library(cis->data);
|
|
|
|
/* No need to re-allocate, string should be shorter than before (lib status prefix is
|
|
|
|
* removed). */
|
|
|
|
BKE_id_full_name_ui_prefix_get(name_buf, cis->data, false, UI_SEP_CHAR, &name_prefix_offset);
|
|
|
|
BLI_assert(strlen(name_buf) <= MEM_allocN_len(cis->name));
|
|
|
|
strcpy(cis->name, name_buf);
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2021-02-19 17:56:24 +01:00
|
|
|
|
|
|
|
return UI_search_item_add(items,
|
|
|
|
cis->name,
|
|
|
|
cis->data,
|
|
|
|
cis->iconid,
|
|
|
|
cis->has_sep_char ? UI_BUT_HAS_SEP_CHAR : 0,
|
|
|
|
name_prefix_offset);
|
2017-05-12 01:42:42 +02:00
|
|
|
}
|
|
|
|
|
2020-05-07 23:16:05 +10:00
|
|
|
void ui_rna_collection_search_update_fn(const struct bContext *C,
|
|
|
|
void *arg,
|
|
|
|
const char *str,
|
UI: Expose an "is first search" boolean to search button callbacks
Currently when you open an RNA collection search button, like a
vertex group selector, the search filter isn't applied until you
start typing, in order to display every option at the start.
Otherwise they wouldn't be visible, since the search filter would
run for the current text.
Currently this check happens in one place, but it relies on the
`changed` value of `uiBut`. This is fine in the interface directory,
but anywhere else it would require exposing `uiBut.changed`, which
is probably too low-level to expose.
The solution is adding an `is_first` argument to the search callbacks,
which is nice for a few reasons:
- They work at a higher level of abstraction, meaning they don't
have to worry about how exactly to tell if this is the first
search.
- It makes it easier to do special behavior when the search menu
is first opened.
- Then, obviously, it makes that state accessible without including
`interface_intern.h`.
Needed for attribute search: T85658
Differential Revision: https://developer.blender.org/D10528
2021-03-02 11:42:05 -06:00
|
|
|
uiSearchItems *items,
|
|
|
|
const bool is_first)
|
2017-05-12 01:42:42 +02:00
|
|
|
{
|
|
|
|
uiRNACollectionSearch *data = arg;
|
2020-06-15 18:32:51 +10:00
|
|
|
const int flag = RNA_property_flag(data->target_prop);
|
2017-05-12 01:42:42 +02:00
|
|
|
ListBase *items_list = MEM_callocN(sizeof(ListBase), "items_list");
|
2020-05-11 16:55:33 +02:00
|
|
|
const bool is_ptr_target = (RNA_property_type(data->target_prop) == PROP_POINTER);
|
|
|
|
/* For non-pointer properties, UI code acts entirely based on the item's name. So the name has to
|
|
|
|
* match the RNA name exactly. So only for pointer properties, the name can be modified to add
|
|
|
|
* further UI hints. */
|
|
|
|
const bool requires_exact_data_name = !is_ptr_target;
|
UI: Expose an "is first search" boolean to search button callbacks
Currently when you open an RNA collection search button, like a
vertex group selector, the search filter isn't applied until you
start typing, in order to display every option at the start.
Otherwise they wouldn't be visible, since the search filter would
run for the current text.
Currently this check happens in one place, but it relies on the
`changed` value of `uiBut`. This is fine in the interface directory,
but anywhere else it would require exposing `uiBut.changed`, which
is probably too low-level to expose.
The solution is adding an `is_first` argument to the search callbacks,
which is nice for a few reasons:
- They work at a higher level of abstraction, meaning they don't
have to worry about how exactly to tell if this is the first
search.
- It makes it easier to do special behavior when the search menu
is first opened.
- Then, obviously, it makes that state accessible without including
`interface_intern.h`.
Needed for attribute search: T85658
Differential Revision: https://developer.blender.org/D10528
2021-03-02 11:42:05 -06:00
|
|
|
const bool skip_filter = is_first;
|
2020-04-10 20:07:11 +02:00
|
|
|
char name_buf[UI_MAX_DRAW_STR];
|
|
|
|
char *name;
|
2020-06-29 17:19:43 +02:00
|
|
|
bool has_id_icon = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-02-19 17:56:24 +01:00
|
|
|
StringSearch *search = skip_filter ? NULL : BLI_string_search_new();
|
2020-07-07 10:08:42 +02:00
|
|
|
|
2017-05-12 01:42:42 +02:00
|
|
|
/* build a temporary list of relevant items first */
|
2021-02-19 17:56:24 +01:00
|
|
|
int item_index = 0;
|
2017-05-12 01:42:42 +02:00
|
|
|
RNA_PROP_BEGIN (&data->search_ptr, itemptr, data->search_prop) {
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-25 10:15:20 +11:00
|
|
|
if (flag & PROP_ID_SELF_CHECK) {
|
2019-08-23 09:52:12 +02:00
|
|
|
if (itemptr.data == data->target_ptr.owner_id) {
|
2017-05-12 01:42:42 +02:00
|
|
|
continue;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-05-12 01:42:42 +02:00
|
|
|
/* use filter */
|
2020-05-11 16:55:33 +02:00
|
|
|
if (is_ptr_target) {
|
2019-03-25 10:15:20 +11:00
|
|
|
if (RNA_property_pointer_poll(&data->target_ptr, data->target_prop, &itemptr) == 0) {
|
2017-05-12 01:42:42 +02:00
|
|
|
continue;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-07-23 17:24:17 +10:00
|
|
|
int name_prefix_offset = 0;
|
2020-06-15 18:32:51 +10:00
|
|
|
int iconid = ICON_NONE;
|
|
|
|
bool has_sep_char = false;
|
2020-08-26 10:11:13 +10:00
|
|
|
const bool is_id = itemptr.type && RNA_struct_is_ID(itemptr.type);
|
2020-06-15 18:32:51 +10:00
|
|
|
|
2020-06-29 17:19:43 +02:00
|
|
|
if (is_id) {
|
2017-05-13 19:48:04 +02:00
|
|
|
iconid = ui_id_icon_get(C, itemptr.data, false);
|
2020-06-29 17:19:43 +02:00
|
|
|
if (!ELEM(iconid, 0, ICON_BLANK1)) {
|
|
|
|
has_id_icon = true;
|
|
|
|
}
|
2020-04-10 20:07:11 +02:00
|
|
|
|
2020-05-11 16:55:33 +02:00
|
|
|
if (requires_exact_data_name) {
|
|
|
|
name = RNA_struct_name_get_alloc(&itemptr, name_buf, sizeof(name_buf), NULL);
|
|
|
|
}
|
|
|
|
else {
|
2020-06-15 18:32:51 +10:00
|
|
|
const ID *id = itemptr.data;
|
2020-07-23 17:24:17 +10:00
|
|
|
BKE_id_full_name_ui_prefix_get(
|
|
|
|
name_buf, itemptr.data, true, UI_SEP_CHAR, &name_prefix_offset);
|
2020-05-11 16:55:33 +02:00
|
|
|
BLI_STATIC_ASSERT(sizeof(name_buf) >= MAX_ID_FULL_NAME_UI,
|
|
|
|
"Name string buffer should be big enough to hold full UI ID name");
|
|
|
|
name = name_buf;
|
2020-06-15 18:32:51 +10:00
|
|
|
has_sep_char = (id->lib != NULL);
|
2020-05-11 16:55:33 +02:00
|
|
|
}
|
2020-04-10 20:07:11 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
name = RNA_struct_name_get_alloc(&itemptr, name_buf, sizeof(name_buf), NULL);
|
2017-05-12 01:42:42 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-05-12 01:42:42 +02:00
|
|
|
if (name) {
|
2021-02-19 17:56:24 +01:00
|
|
|
CollItemSearch *cis = MEM_callocN(sizeof(CollItemSearch), "CollectionItemSearch");
|
|
|
|
cis->data = itemptr.data;
|
|
|
|
cis->name = BLI_strdup(name);
|
|
|
|
cis->index = item_index;
|
|
|
|
cis->iconid = iconid;
|
|
|
|
cis->is_id = is_id;
|
|
|
|
cis->name_prefix_offset = name_prefix_offset;
|
|
|
|
cis->has_sep_char = has_sep_char;
|
|
|
|
if (!skip_filter) {
|
|
|
|
BLI_string_search_add(search, name, cis);
|
2017-05-12 01:42:42 +02:00
|
|
|
}
|
2021-02-19 17:56:24 +01:00
|
|
|
BLI_addtail(items_list, cis);
|
2020-04-10 20:07:11 +02:00
|
|
|
if (name != name_buf) {
|
|
|
|
MEM_freeN(name);
|
|
|
|
}
|
2017-05-12 01:42:42 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-02-19 17:56:24 +01:00
|
|
|
item_index++;
|
2017-05-12 01:42:42 +02:00
|
|
|
}
|
|
|
|
RNA_PROP_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-02-19 17:56:24 +01:00
|
|
|
if (skip_filter) {
|
|
|
|
LISTBASE_FOREACH (CollItemSearch *, cis, items_list) {
|
|
|
|
if (!add_collection_search_item(cis, requires_exact_data_name, has_id_icon, items)) {
|
|
|
|
break;
|
|
|
|
}
|
2020-06-29 17:19:43 +02:00
|
|
|
}
|
2021-02-19 17:56:24 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
CollItemSearch **filtered_items;
|
|
|
|
int filtered_amount = BLI_string_search_query(search, str, (void ***)&filtered_items);
|
2020-06-29 17:19:43 +02:00
|
|
|
|
2021-02-19 17:56:24 +01:00
|
|
|
for (int i = 0; i < filtered_amount; i++) {
|
|
|
|
CollItemSearch *cis = filtered_items[i];
|
|
|
|
if (!add_collection_search_item(cis, requires_exact_data_name, has_id_icon, items)) {
|
|
|
|
break;
|
|
|
|
}
|
2017-05-12 01:42:42 +02:00
|
|
|
}
|
2021-02-19 17:56:24 +01:00
|
|
|
|
|
|
|
MEM_freeN(filtered_items);
|
|
|
|
BLI_string_search_free(search);
|
2017-05-12 01:42:42 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-02-19 17:56:24 +01:00
|
|
|
LISTBASE_FOREACH (CollItemSearch *, cis, items_list) {
|
2017-05-12 01:42:42 +02:00
|
|
|
MEM_freeN(cis->name);
|
|
|
|
}
|
|
|
|
BLI_freelistN(items_list);
|
|
|
|
MEM_freeN(items_list);
|
|
|
|
}
|
|
|
|
|
2018-05-23 10:50:35 +02:00
|
|
|
/***************************** ID Utilities *******************************/
|
2021-02-17 16:42:20 -06:00
|
|
|
int UI_icon_from_id(const ID *id)
|
2009-09-16 01:15:30 +00:00
|
|
|
{
|
2019-03-25 10:15:20 +11:00
|
|
|
if (id == NULL) {
|
2011-02-27 18:03:19 +00:00
|
|
|
return ICON_NONE;
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2018-05-23 10:47:12 +02:00
|
|
|
|
2009-09-16 19:36:17 +00:00
|
|
|
/* exception for objects */
|
2021-02-17 16:42:20 -06:00
|
|
|
if (GS(id->name) == ID_OB) {
|
|
|
|
Object *ob = (Object *)id;
|
2009-06-03 00:14:12 +00:00
|
|
|
|
2019-03-25 10:15:20 +11:00
|
|
|
if (ob->type == OB_EMPTY) {
|
2009-09-16 19:36:17 +00:00
|
|
|
return ICON_EMPTY_DATA;
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2020-07-03 14:20:10 +02:00
|
|
|
return UI_icon_from_id(ob->data);
|
2009-06-03 00:14:12 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 19:36:17 +00:00
|
|
|
/* otherwise get it through RNA, creating the pointer
|
2012-03-03 16:31:46 +00:00
|
|
|
* will set the right type, also with subclassing */
|
2021-02-17 16:42:20 -06:00
|
|
|
PointerRNA ptr;
|
|
|
|
RNA_id_pointer_create((ID *)id, &ptr);
|
2009-06-03 00:14:12 +00:00
|
|
|
|
2012-03-30 01:51:25 +00:00
|
|
|
return (ptr.type) ? RNA_struct_ui_icon(ptr.type) : ICON_NONE;
|
2009-06-03 00:14:12 +00:00
|
|
|
}
|
2014-01-08 17:04:10 +01:00
|
|
|
|
2014-02-09 12:00:03 +11:00
|
|
|
/* see: report_type_str */
|
2014-11-09 21:20:40 +01:00
|
|
|
int UI_icon_from_report_type(int type)
|
2014-02-09 12:00:03 +11:00
|
|
|
{
|
2019-03-25 10:15:20 +11:00
|
|
|
if (type & RPT_ERROR_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return ICON_CANCEL;
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_WARNING_ALL) {
|
2014-02-09 12:00:03 +11:00
|
|
|
return ICON_ERROR;
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_INFO_ALL) {
|
2014-02-09 12:00:03 +11:00
|
|
|
return ICON_INFO;
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_DEBUG_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return ICON_SYSTEM;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_PROPERTY) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return ICON_OPTIONS;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_OPERATOR) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return ICON_CHECKMARK;
|
|
|
|
}
|
|
|
|
return ICON_INFO;
|
|
|
|
}
|
|
|
|
|
|
|
|
int UI_icon_colorid_from_report_type(int type)
|
|
|
|
{
|
|
|
|
if (type & RPT_ERROR_ALL) {
|
|
|
|
return TH_INFO_ERROR;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_WARNING_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_WARNING;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_INFO_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_INFO;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_DEBUG_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_DEBUG;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_PROPERTY) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_PROPERTY;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_OPERATOR) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_OPERATOR;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
return TH_INFO_WARNING;
|
2021-02-08 08:19:23 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
int UI_text_colorid_from_report_type(int type)
|
|
|
|
{
|
|
|
|
if (type & RPT_ERROR_ALL) {
|
|
|
|
return TH_INFO_ERROR_TEXT;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_WARNING_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_WARNING_TEXT;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_INFO_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_INFO_TEXT;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_DEBUG_ALL) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_DEBUG_TEXT;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_PROPERTY) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_PROPERTY_TEXT;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
if (type & RPT_OPERATOR) {
|
2021-02-08 08:19:23 -08:00
|
|
|
return TH_INFO_OPERATOR_TEXT;
|
|
|
|
}
|
2021-02-15 15:30:17 +01:00
|
|
|
return TH_INFO_WARNING_TEXT;
|
2014-02-09 12:00:03 +11:00
|
|
|
}
|
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
/********************************** Misc **************************************/
|
|
|
|
|
|
|
|
/**
|
2019-04-17 08:44:38 +02:00
|
|
|
* Returns the best "UI" precision for given floating value,
|
|
|
|
* so that e.g. 10.000001 rather gets drawn as '10'...
|
2014-01-08 17:04:10 +01:00
|
|
|
*/
|
2014-11-09 21:20:40 +01:00
|
|
|
int UI_calc_float_precision(int prec, double value)
|
2014-01-08 17:04:10 +01:00
|
|
|
{
|
2017-07-21 10:52:36 +02:00
|
|
|
static const double pow10_neg[UI_PRECISION_FLOAT_MAX + 1] = {
|
|
|
|
1e0, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6};
|
2014-01-08 17:04:10 +01:00
|
|
|
static const double max_pow = 10000000.0; /* pow(10, UI_PRECISION_FLOAT_MAX) */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
BLI_assert(prec <= UI_PRECISION_FLOAT_MAX);
|
2014-06-18 13:13:22 +09:00
|
|
|
BLI_assert(fabs(pow10_neg[prec] - pow(10, -prec)) < 1e-16);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-17 08:44:38 +02:00
|
|
|
/* Check on the number of decimal places need to display the number,
|
|
|
|
* this is so 0.00001 is not displayed as 0.00,
|
2021-07-07 12:55:19 +10:00
|
|
|
* _but_, this is only for small values as 10.0001 will not get the same treatment.
|
2014-01-08 17:04:10 +01:00
|
|
|
*/
|
2020-03-06 17:18:10 +01:00
|
|
|
value = fabs(value);
|
2014-01-08 17:04:10 +01:00
|
|
|
if ((value < pow10_neg[prec]) && (value > (1.0 / max_pow))) {
|
|
|
|
int value_i = (int)((value * max_pow) + 0.5);
|
|
|
|
if (value_i != 0) {
|
|
|
|
const int prec_span = 3; /* show: 0.01001, 5 would allow 0.0100001 for eg. */
|
|
|
|
int test_prec;
|
|
|
|
int prec_min = -1;
|
|
|
|
int dec_flag = 0;
|
|
|
|
int i = UI_PRECISION_FLOAT_MAX;
|
|
|
|
while (i && value_i) {
|
|
|
|
if (value_i % 10) {
|
|
|
|
dec_flag |= 1 << i;
|
|
|
|
prec_min = i;
|
|
|
|
}
|
|
|
|
value_i /= 10;
|
|
|
|
i--;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
/* even though its a small value, if the second last digit is not 0, use it */
|
|
|
|
test_prec = prec_min;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
dec_flag = (dec_flag >> (prec_min + 1)) & ((1 << prec_span) - 1);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
while (dec_flag) {
|
|
|
|
test_prec++;
|
|
|
|
dec_flag = dec_flag >> 1;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
if (test_prec > prec) {
|
|
|
|
prec = test_prec;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
CLAMP(prec, 0, UI_PRECISION_FLOAT_MAX);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-08 17:04:10 +01:00
|
|
|
return prec;
|
|
|
|
}
|
2014-02-08 09:03:25 +11:00
|
|
|
|
2015-04-27 01:17:51 +10:00
|
|
|
bool UI_but_online_manual_id(const uiBut *but, char *r_str, size_t maxlength)
|
|
|
|
{
|
2019-08-23 09:52:12 +02:00
|
|
|
if (but->rnapoin.owner_id && but->rnapoin.data && but->rnaprop) {
|
2018-07-01 19:57:31 +02:00
|
|
|
BLI_snprintf(r_str,
|
|
|
|
maxlength,
|
|
|
|
"%s.%s",
|
|
|
|
RNA_struct_identifier(but->rnapoin.type),
|
|
|
|
RNA_property_identifier(but->rnaprop));
|
2015-04-27 01:17:51 +10:00
|
|
|
return true;
|
|
|
|
}
|
2020-07-03 14:20:10 +02:00
|
|
|
if (but->optype) {
|
2015-04-27 01:17:51 +10:00
|
|
|
WM_operator_py_idname(r_str, but->optype->idname);
|
|
|
|
return true;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-04-27 01:17:51 +10:00
|
|
|
*r_str = '\0';
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UI_but_online_manual_id_from_active(const struct bContext *C, char *r_str, size_t maxlength)
|
|
|
|
{
|
|
|
|
uiBut *but = UI_context_active_but_get(C);
|
|
|
|
|
|
|
|
if (but) {
|
|
|
|
return UI_but_online_manual_id(but, r_str, maxlength);
|
|
|
|
}
|
|
|
|
|
|
|
|
*r_str = '\0';
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2021-07-13 17:06:15 +02:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
static rctf ui_but_rect_to_view(const uiBut *but, const ARegion *region, const View2D *v2d)
|
|
|
|
{
|
|
|
|
rctf region_rect;
|
|
|
|
ui_block_to_region_rctf(region, but->block, ®ion_rect, &but->rect);
|
|
|
|
|
|
|
|
rctf view_rect;
|
|
|
|
UI_view2d_region_to_view_rctf(v2d, ®ion_rect, &view_rect);
|
|
|
|
|
|
|
|
return view_rect;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* To get a margin (typically wanted), add the margin to \a rect directly.
|
|
|
|
*
|
|
|
|
* Based on #file_ensure_inside_viewbounds(), could probably share code.
|
|
|
|
*
|
|
|
|
* \return true if anything changed.
|
|
|
|
*/
|
|
|
|
static bool ui_view2d_cur_ensure_rect_in_view(View2D *v2d, const rctf *rect)
|
|
|
|
{
|
|
|
|
const float rect_width = BLI_rctf_size_x(rect);
|
|
|
|
const float rect_height = BLI_rctf_size_y(rect);
|
|
|
|
|
|
|
|
rctf *cur = &v2d->cur;
|
|
|
|
const float cur_width = BLI_rctf_size_x(cur);
|
|
|
|
const float cur_height = BLI_rctf_size_y(cur);
|
|
|
|
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
/* Snap to bottom edge. Also use if rect is higher than view bounds (could be a parameter). */
|
|
|
|
if ((cur->ymin > rect->ymin) || (rect_height > cur_height)) {
|
|
|
|
cur->ymin = rect->ymin;
|
|
|
|
cur->ymax = cur->ymin + cur_height;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
/* Snap to upper edge. */
|
|
|
|
else if (cur->ymax < rect->ymax) {
|
|
|
|
cur->ymax = rect->ymax;
|
|
|
|
cur->ymin = cur->ymax - cur_height;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
/* Snap to left edge. Also use if rect is wider than view bounds. */
|
|
|
|
else if ((cur->xmin > rect->xmin) || (rect_width > cur_width)) {
|
|
|
|
cur->xmin = rect->xmin;
|
|
|
|
cur->xmax = cur->xmin + cur_width;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
/* Snap to right edge. */
|
|
|
|
else if (cur->xmax < rect->xmax) {
|
|
|
|
cur->xmax = rect->xmax;
|
|
|
|
cur->xmin = cur->xmax - cur_width;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_assert(BLI_rctf_inside_rctf(cur, rect));
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adjust the view so the rectangle of \a but is in view, with some extra margin.
|
|
|
|
*
|
|
|
|
* It's important that this is only executed after buttons received their final #uiBut.rect. E.g.
|
|
|
|
* #UI_panels_end() modifies them, so if that is executed, this function must not be called before
|
|
|
|
* it.
|
|
|
|
*
|
|
|
|
* \param region: The region the button is placed in. Make sure this is actually the one the button
|
|
|
|
* is placed in, not just the context region.
|
|
|
|
*/
|
|
|
|
void UI_but_ensure_in_view(const bContext *C, ARegion *region, const uiBut *but)
|
|
|
|
{
|
|
|
|
View2D *v2d = ®ion->v2d;
|
2021-07-16 11:45:51 +10:00
|
|
|
/* Uninitialized view or region that doesn't use View2D. */
|
2021-07-13 17:06:15 +02:00
|
|
|
if ((v2d->flag & V2D_IS_INIT) == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
rctf rect = ui_but_rect_to_view(but, region, v2d);
|
|
|
|
|
|
|
|
const int margin = UI_UNIT_X * 0.5f;
|
|
|
|
BLI_rctf_pad(&rect, margin, margin);
|
|
|
|
|
|
|
|
const bool changed = ui_view2d_cur_ensure_rect_in_view(v2d, &rect);
|
|
|
|
if (changed) {
|
|
|
|
UI_view2d_curRect_changed(C, v2d);
|
|
|
|
ED_region_tag_redraw_no_rebuild(region);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Button Store
|
2020-10-27 21:32:09 +11:00
|
|
|
*
|
2014-02-08 09:03:25 +11:00
|
|
|
* Modal Button Store API.
|
|
|
|
*
|
|
|
|
* Store for modal operators & handlers to register button pointers
|
|
|
|
* which are maintained while drawing or NULL when removed.
|
|
|
|
*
|
|
|
|
* This is needed since button pointers are continuously freed and re-allocated.
|
|
|
|
*
|
|
|
|
* \{ */
|
|
|
|
|
2014-02-09 13:56:49 +01:00
|
|
|
struct uiButStore {
|
2014-02-08 09:03:25 +11:00
|
|
|
struct uiButStore *next, *prev;
|
|
|
|
uiBlock *block;
|
|
|
|
ListBase items;
|
2014-02-09 13:56:49 +01:00
|
|
|
};
|
2014-02-08 09:03:25 +11:00
|
|
|
|
2014-02-09 13:56:49 +01:00
|
|
|
struct uiButStoreElem {
|
2014-02-08 09:03:25 +11:00
|
|
|
struct uiButStoreElem *next, *prev;
|
|
|
|
uiBut **but_p;
|
2014-02-09 13:56:49 +01:00
|
|
|
};
|
2014-02-08 09:03:25 +11:00
|
|
|
|
|
|
|
/**
|
2014-03-15 20:08:29 +11:00
|
|
|
* Create a new button store, the caller must manage and run #UI_butstore_free
|
2014-02-08 09:03:25 +11:00
|
|
|
*/
|
|
|
|
uiButStore *UI_butstore_create(uiBlock *block)
|
|
|
|
{
|
|
|
|
uiButStore *bs_handle = MEM_callocN(sizeof(uiButStore), __func__);
|
|
|
|
|
|
|
|
bs_handle->block = block;
|
|
|
|
BLI_addtail(&block->butstore, bs_handle);
|
|
|
|
|
|
|
|
return bs_handle;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UI_butstore_free(uiBlock *block, uiButStore *bs_handle)
|
|
|
|
{
|
2017-07-11 19:07:37 +10:00
|
|
|
/* Workaround for button store being moved into new block,
|
2019-04-17 08:44:38 +02:00
|
|
|
* which then can't use the previous buttons state
|
|
|
|
* ('ui_but_update_from_old_block' fails to find a match),
|
|
|
|
* keeping the active button in the old block holding a reference
|
|
|
|
* to the button-state in the new block: see T49034.
|
2017-07-11 19:07:37 +10:00
|
|
|
*
|
|
|
|
* Ideally we would manage moving the 'uiButStore', keeping a correct state.
|
|
|
|
* All things considered this is the most straightforward fix - Campbell.
|
|
|
|
*/
|
|
|
|
if (block != bs_handle->block && bs_handle->block != NULL) {
|
|
|
|
block = bs_handle->block;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
BLI_freelistN(&bs_handle->items);
|
2020-04-08 22:36:58 +02:00
|
|
|
BLI_assert(BLI_findindex(&block->butstore, bs_handle) != -1);
|
2014-02-08 09:03:25 +11:00
|
|
|
BLI_remlink(&block->butstore, bs_handle);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
MEM_freeN(bs_handle);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UI_butstore_is_valid(uiButStore *bs)
|
|
|
|
{
|
|
|
|
return (bs->block != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UI_butstore_is_registered(uiBlock *block, uiBut *but)
|
|
|
|
{
|
2020-08-18 21:46:29 -04:00
|
|
|
LISTBASE_FOREACH (uiButStore *, bs_handle, &block->butstore) {
|
|
|
|
LISTBASE_FOREACH (uiButStoreElem *, bs_elem, &bs_handle->items) {
|
2014-02-08 09:03:25 +11:00
|
|
|
if (*bs_elem->but_p == but) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UI_butstore_register(uiButStore *bs_handle, uiBut **but_p)
|
|
|
|
{
|
|
|
|
uiButStoreElem *bs_elem = MEM_callocN(sizeof(uiButStoreElem), __func__);
|
|
|
|
BLI_assert(*but_p);
|
|
|
|
bs_elem->but_p = but_p;
|
|
|
|
|
|
|
|
BLI_addtail(&bs_handle->items, bs_elem);
|
|
|
|
}
|
|
|
|
|
|
|
|
void UI_butstore_unregister(uiButStore *bs_handle, uiBut **but_p)
|
|
|
|
{
|
2020-08-18 21:46:29 -04:00
|
|
|
LISTBASE_FOREACH_MUTABLE (uiButStoreElem *, bs_elem, &bs_handle->items) {
|
2014-02-08 09:03:25 +11:00
|
|
|
if (bs_elem->but_p == but_p) {
|
|
|
|
BLI_remlink(&bs_handle->items, bs_elem);
|
|
|
|
MEM_freeN(bs_elem);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BLI_assert(0);
|
|
|
|
}
|
|
|
|
|
2014-12-01 23:30:54 +01:00
|
|
|
/**
|
|
|
|
* Update the pointer for a registered button.
|
|
|
|
*/
|
|
|
|
bool UI_butstore_register_update(uiBlock *block, uiBut *but_dst, const uiBut *but_src)
|
|
|
|
{
|
|
|
|
bool found = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-18 21:46:29 -04:00
|
|
|
LISTBASE_FOREACH (uiButStore *, bs_handle, &block->butstore) {
|
|
|
|
LISTBASE_FOREACH (uiButStoreElem *, bs_elem, &bs_handle->items) {
|
2014-12-01 23:30:54 +01:00
|
|
|
if (*bs_elem->but_p == but_src) {
|
|
|
|
*bs_elem->but_p = but_dst;
|
|
|
|
found = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-12-01 23:30:54 +01:00
|
|
|
return found;
|
|
|
|
}
|
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
/**
|
|
|
|
* NULL all pointers, don't free since the owner needs to be able to inspect.
|
|
|
|
*/
|
|
|
|
void UI_butstore_clear(uiBlock *block)
|
|
|
|
{
|
2020-08-18 21:46:29 -04:00
|
|
|
LISTBASE_FOREACH (uiButStore *, bs_handle, &block->butstore) {
|
2014-02-08 09:03:25 +11:00
|
|
|
bs_handle->block = NULL;
|
2020-08-18 21:46:29 -04:00
|
|
|
LISTBASE_FOREACH (uiButStoreElem *, bs_elem, &bs_handle->items) {
|
2014-02-08 09:03:25 +11:00
|
|
|
*bs_elem->but_p = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Map freed buttons from the old block and update pointers.
|
|
|
|
*/
|
|
|
|
void UI_butstore_update(uiBlock *block)
|
|
|
|
{
|
|
|
|
/* move this list to the new block */
|
|
|
|
if (block->oldblock) {
|
|
|
|
if (block->oldblock->butstore.first) {
|
2020-04-08 22:36:58 +02:00
|
|
|
BLI_movelisttolist(&block->butstore, &block->oldblock->butstore);
|
2014-02-08 09:03:25 +11:00
|
|
|
}
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-25 10:15:20 +11:00
|
|
|
if (LIKELY(block->butstore.first == NULL)) {
|
2014-02-08 09:03:25 +11:00
|
|
|
return;
|
2019-03-25 10:15:20 +11:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
/* warning, loop-in-loop, in practice we only store <10 buttons at a time,
|
|
|
|
* so this isn't going to be a problem, if that changes old-new mapping can be cached first */
|
2020-08-18 21:46:29 -04:00
|
|
|
LISTBASE_FOREACH (uiButStore *, bs_handle, &block->butstore) {
|
2020-11-06 12:51:49 +11:00
|
|
|
BLI_assert(ELEM(bs_handle->block, NULL, block) ||
|
2014-02-08 09:03:25 +11:00
|
|
|
(block->oldblock && block->oldblock == bs_handle->block));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
if (bs_handle->block == block->oldblock) {
|
|
|
|
bs_handle->block = block;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-18 21:46:29 -04:00
|
|
|
LISTBASE_FOREACH (uiButStoreElem *, bs_elem, &bs_handle->items) {
|
2014-02-08 09:03:25 +11:00
|
|
|
if (*bs_elem->but_p) {
|
|
|
|
uiBut *but_new = ui_but_find_new(block, *bs_elem->but_p);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-02-08 09:03:25 +11:00
|
|
|
/* can be NULL if the buttons removed,
|
2021-07-03 23:08:40 +10:00
|
|
|
* NOTE: we could allow passing in a callback when buttons are removed
|
2014-02-08 09:03:25 +11:00
|
|
|
* so the caller can cleanup */
|
|
|
|
*bs_elem->but_p = but_new;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \} */
|