2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2008-11-29 01:04:15 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2008-11-29 01:04:15 +00:00
|
|
|
*/
|
|
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup RNA
|
2011-02-27 20:20:01 +00:00
|
|
|
*/
|
|
|
|
|
|
2010-01-01 20:50:58 +00:00
|
|
|
#include <stddef.h>
|
2020-03-19 09:33:03 +01:00
|
|
|
#include <stdlib.h>
|
2008-11-29 01:04:15 +00:00
|
|
|
|
|
|
|
|
#include "RNA_define.h"
|
2009-10-13 17:50:14 +00:00
|
|
|
#include "RNA_enum_types.h"
|
2008-11-29 01:04:15 +00:00
|
|
|
|
|
|
|
|
#include "rna_internal.h"
|
|
|
|
|
|
|
|
|
|
#include "DNA_scene_types.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "DNA_screen_types.h"
|
2017-06-13 12:02:08 +02:00
|
|
|
#include "DNA_workspace_types.h"
|
2008-11-29 01:04:15 +00:00
|
|
|
|
2020-07-18 07:49:25 -07:00
|
|
|
#include "ED_info.h"
|
|
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem rna_enum_region_type_items[] = {
|
2009-06-16 00:52:21 +00:00
|
|
|
{RGN_TYPE_WINDOW, "WINDOW", 0, "Window", ""},
|
|
|
|
|
{RGN_TYPE_HEADER, "HEADER", 0, "Header", ""},
|
|
|
|
|
{RGN_TYPE_CHANNELS, "CHANNELS", 0, "Channels", ""},
|
|
|
|
|
{RGN_TYPE_TEMPORARY, "TEMPORARY", 0, "Temporary", ""},
|
|
|
|
|
{RGN_TYPE_UI, "UI", 0, "UI", ""},
|
2010-01-01 20:50:58 +00:00
|
|
|
{RGN_TYPE_TOOLS, "TOOLS", 0, "Tools", ""},
|
|
|
|
|
{RGN_TYPE_TOOL_PROPS, "TOOL_PROPS", 0, "Tool Properties", ""},
|
2009-12-15 17:53:17 +00:00
|
|
|
{RGN_TYPE_PREVIEW, "PREVIEW", 0, "Preview", ""},
|
2019-02-16 21:25:29 +11:00
|
|
|
{RGN_TYPE_HUD, "HUD", 0, "Floating Region", ""},
|
UI: Vertical Properties Editor Tabs
Moves the Properties editor context switching to a vertical tabs region.
Design Task: T54951
Differential Revison: D3840
The tabs are regular widgets, unlike the 'old' toolshelf tabs. This means they
give mouse hover feedback, have tooltips, support the right-click menu, etc.
Also, when vertical screen space gets tight, the tabs can be scrolled, they
don't shrink like the toolshelf ones.
The tab region is slightly larger than the header. The tabs are scaled up
accordingly. This makes them nicely readable.
The header is quite empty now. As shown in T54951, we wanted to have a search
button there. This should be added next.
Implementation Notes:
* Added a new region type, RGN_TYPE_NAVIGATION.
* Having the tabs in a separate region allows scrolling of the tab-bar, unlike
the toolshelf tabs. We might want to remove the scrollbars though.
* Added a new region flag RGN_FLAG_PREFSIZE_OR_HIDDEN, to ensure the tab region
is either hidden or has a fixed size.
* Added some additional flags to support fine-tuning the layout in panel and
layout code.
* Bumps subversion.
2018-10-29 21:34:14 +01:00
|
|
|
{RGN_TYPE_NAV_BAR, "NAVIGATION_BAR", 0, "Navigation Bar", ""},
|
2019-01-04 21:40:16 +01:00
|
|
|
{RGN_TYPE_EXECUTE, "EXECUTE", 0, "Execute Buttons", ""},
|
2019-04-05 13:48:26 +02:00
|
|
|
{RGN_TYPE_FOOTER, "FOOTER", 0, "Footer", ""},
|
2019-04-18 21:13:22 +02:00
|
|
|
{RGN_TYPE_TOOL_HEADER, "TOOL_HEADER", 0, "Tool Header", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2012-05-12 11:01:29 +00:00
|
|
|
};
|
2009-04-01 12:43:07 +00:00
|
|
|
|
2009-07-16 00:50:27 +00:00
|
|
|
#include "ED_screen.h"
|
|
|
|
|
|
2009-06-30 19:10:14 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
2011-02-01 23:41:01 +00:00
|
|
|
#ifdef RNA_RUNTIME
|
|
|
|
|
|
2012-01-06 17:32:20 +00:00
|
|
|
# include "BKE_global.h"
|
2018-05-29 09:19:06 +02:00
|
|
|
# include "BKE_screen.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
# include "BKE_workspace.h"
|
2011-02-01 23:41:01 +00:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
# include "DEG_depsgraph.h"
|
|
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
# include "UI_view2d.h"
|
|
|
|
|
|
2014-02-17 12:33:00 +06:00
|
|
|
# ifdef WITH_PYTHON
|
|
|
|
|
# include "BPY_extern.h"
|
|
|
|
|
# endif
|
|
|
|
|
|
2018-08-17 17:32:36 +02:00
|
|
|
static void rna_Screen_bar_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
|
|
|
|
|
{
|
|
|
|
|
bScreen *screen = (bScreen *)ptr->data;
|
|
|
|
|
screen->do_draw = true;
|
|
|
|
|
screen->do_refresh = true;
|
|
|
|
|
}
|
2009-06-30 19:10:14 +00:00
|
|
|
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
static void rna_Screen_redraw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
|
|
|
|
|
{
|
|
|
|
|
bScreen *screen = (bScreen *)ptr->data;
|
2009-06-30 19:10:14 +00:00
|
|
|
|
2018-04-20 17:17:10 +02:00
|
|
|
/* the settings for this are currently only available from a menu in the TimeLine,
|
|
|
|
|
* hence refresh=SPACE_ACTION, as timeline is now in there
|
|
|
|
|
*/
|
2020-02-22 03:00:23 +11:00
|
|
|
ED_screen_animation_timer_update(screen, screen->redraws_flag);
|
2009-06-30 19:10:14 +00:00
|
|
|
}
|
|
|
|
|
|
2018-07-05 22:46:04 +02:00
|
|
|
static bool rna_Screen_is_animation_playing_get(PointerRNA *UNUSED(ptr))
|
2009-06-30 19:10:14 +00:00
|
|
|
{
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
/* can be NULL on file load, T42619 */
|
2018-06-22 12:50:26 +02:00
|
|
|
wmWindowManager *wm = G_MAIN->wm.first;
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
return wm ? (ED_screen_animation_playing(wm) != NULL) : 0;
|
|
|
|
|
}
|
2012-01-06 17:32:20 +00:00
|
|
|
|
2020-07-13 15:26:00 +02:00
|
|
|
static bool rna_Screen_is_scrubbing_get(PointerRNA *ptr)
|
|
|
|
|
{
|
|
|
|
|
bScreen *screen = (bScreen *)ptr->data;
|
|
|
|
|
return screen->scrubbing;
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
static int rna_region_alignment_get(PointerRNA *ptr)
|
|
|
|
|
{
|
|
|
|
|
ARegion *region = ptr->data;
|
2019-05-03 13:04:37 +10:00
|
|
|
return RGN_ALIGN_ENUM_FROM_MASK(region->alignment);
|
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
|
|
|
}
|
|
|
|
|
|
2018-07-05 22:25:34 +02:00
|
|
|
static bool rna_Screen_fullscreen_get(PointerRNA *ptr)
|
2009-12-08 07:12:06 +00:00
|
|
|
{
|
2020-04-03 14:23:21 +02:00
|
|
|
bScreen *screen = (bScreen *)ptr->data;
|
|
|
|
|
return (screen->state == SCREENMAXIMIZED);
|
2009-12-08 07:12:06 +00:00
|
|
|
}
|
|
|
|
|
|
2013-06-10 11:08:37 +00:00
|
|
|
/* UI compatible list: should not be needed, but for now we need to keep EMPTY
|
|
|
|
|
* at least in the static version of this enum for python scripts. */
|
2019-01-02 17:03:45 +11:00
|
|
|
static const EnumPropertyItem *rna_Area_type_itemf(bContext *UNUSED(C),
|
|
|
|
|
PointerRNA *UNUSED(ptr),
|
|
|
|
|
PropertyRNA *UNUSED(prop),
|
|
|
|
|
bool *r_free)
|
2013-06-10 10:37:24 +00:00
|
|
|
{
|
2013-06-10 11:08:37 +00:00
|
|
|
/* +1 to skip SPACE_EMPTY */
|
2020-02-18 10:23:53 +11:00
|
|
|
*r_free = false;
|
|
|
|
|
return rna_enum_space_type_items + 1;
|
2013-06-10 10:37:24 +00:00
|
|
|
}
|
|
|
|
|
|
2014-08-15 08:43:00 +10:00
|
|
|
static int rna_Area_type_get(PointerRNA *ptr)
|
|
|
|
|
{
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area = (ScrArea *)ptr->data;
|
2018-04-22 19:58:27 +02:00
|
|
|
/* Usually 'spacetype' is used. It lags behind a bit while switching area
|
|
|
|
|
* type though, then we use 'butspacetype' instead (T41435). */
|
2020-04-03 13:25:03 +02:00
|
|
|
return (area->butspacetype == SPACE_EMPTY) ? area->spacetype : area->butspacetype;
|
2014-08-15 08:43:00 +10:00
|
|
|
}
|
|
|
|
|
|
2009-10-13 17:50:14 +00:00
|
|
|
static void rna_Area_type_set(PointerRNA *ptr, int value)
|
|
|
|
|
{
|
2018-11-27 14:19:00 +01:00
|
|
|
if (ELEM(value, SPACE_TOPBAR, SPACE_STATUSBAR)) {
|
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
|
|
|
/* Special case: An area can not be set to show the top-bar editor (or
|
|
|
|
|
* other global areas). However it should still be possible to identify
|
|
|
|
|
* its type from Python. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area = (ScrArea *)ptr->data;
|
|
|
|
|
area->butspacetype = value;
|
2009-10-13 17:50:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void rna_Area_type_update(bContext *C, PointerRNA *ptr)
|
|
|
|
|
{
|
2020-04-03 14:23:21 +02:00
|
|
|
bScreen *screen = (bScreen *)ptr->owner_id;
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area = (ScrArea *)ptr->data;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-05-01 11:48:39 +10:00
|
|
|
/* Running update without having called 'set', see: T64049 */
|
2020-04-03 13:25:03 +02:00
|
|
|
if (area->butspacetype == SPACE_EMPTY) {
|
2019-05-01 11:48:39 +10:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
|
wmWindow *win;
|
2012-05-02 13:09:26 +00:00
|
|
|
/* XXX this call still use context, so we trick it to work in the right context */
|
2012-05-12 11:01:29 +00:00
|
|
|
for (win = wm->windows.first; win; win = win->next) {
|
2020-04-03 14:23:21 +02:00
|
|
|
if (screen == WM_window_get_active_screen(win)) {
|
2012-05-02 13:09:26 +00:00
|
|
|
wmWindow *prevwin = CTX_wm_window(C);
|
|
|
|
|
ScrArea *prevsa = CTX_wm_area(C);
|
|
|
|
|
ARegion *prevar = CTX_wm_region(C);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-05-02 13:09:26 +00:00
|
|
|
CTX_wm_window_set(C, win);
|
2020-04-03 13:25:03 +02:00
|
|
|
CTX_wm_area_set(C, area);
|
2012-05-02 13:09:26 +00:00
|
|
|
CTX_wm_region_set(C, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
ED_area_newspace(C, area, area->butspacetype, true);
|
|
|
|
|
ED_area_tag_redraw(area);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-22 19:58:27 +02:00
|
|
|
/* Unset so that rna_Area_type_get uses spacetype instead. */
|
2020-04-03 13:25:03 +02:00
|
|
|
area->butspacetype = SPACE_EMPTY;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-23 19:27:59 +06:00
|
|
|
/* It is possible that new layers becomes visible. */
|
2020-04-03 13:25:03 +02:00
|
|
|
if (area->spacetype == SPACE_VIEW3D) {
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_on_visible_update(CTX_data_main(C), false);
|
2014-01-23 19:27:59 +06:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-05-02 13:09:26 +00:00
|
|
|
CTX_wm_window_set(C, prevwin);
|
|
|
|
|
CTX_wm_area_set(C, prevsa);
|
|
|
|
|
CTX_wm_region_set(C, prevar);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-10-13 17:50:14 +00:00
|
|
|
}
|
|
|
|
|
|
2018-05-29 09:19:06 +02:00
|
|
|
static const EnumPropertyItem *rna_Area_ui_type_itemf(bContext *C,
|
|
|
|
|
PointerRNA *UNUSED(ptr),
|
|
|
|
|
PropertyRNA *UNUSED(prop),
|
|
|
|
|
bool *r_free)
|
|
|
|
|
{
|
|
|
|
|
EnumPropertyItem *item = NULL;
|
|
|
|
|
int totitem = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-29 09:19:06 +02:00
|
|
|
/* +1 to skip SPACE_EMPTY */
|
|
|
|
|
for (const EnumPropertyItem *item_from = rna_enum_space_type_items + 1; item_from->identifier;
|
|
|
|
|
item_from++) {
|
2018-11-27 14:19:00 +01:00
|
|
|
if (ELEM(item_from->value, SPACE_TOPBAR, SPACE_STATUSBAR)) {
|
2018-05-29 09:19:06 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-29 09:19:06 +02:00
|
|
|
SpaceType *st = item_from->identifier[0] ? BKE_spacetype_from_id(item_from->value) : NULL;
|
|
|
|
|
int totitem_prev = totitem;
|
|
|
|
|
if (st && st->space_subtype_item_extend != NULL) {
|
|
|
|
|
st->space_subtype_item_extend(C, &item, &totitem);
|
|
|
|
|
while (totitem_prev < totitem) {
|
|
|
|
|
item[totitem_prev++].value |= item_from->value << 16;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
RNA_enum_item_add(&item, &totitem, item_from);
|
|
|
|
|
item[totitem_prev++].value = item_from->value << 16;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
RNA_enum_item_end(&item, &totitem);
|
|
|
|
|
*r_free = true;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-29 09:19:06 +02:00
|
|
|
return item;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int rna_Area_ui_type_get(PointerRNA *ptr)
|
|
|
|
|
{
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area = ptr->data;
|
2019-08-14 15:51:54 +02:00
|
|
|
const int area_type = rna_Area_type_get(ptr);
|
2020-04-03 13:25:03 +02:00
|
|
|
const bool area_changing = area->butspacetype != SPACE_EMPTY;
|
2019-08-14 15:51:54 +02:00
|
|
|
int value = area_type << 16;
|
|
|
|
|
|
2020-05-08 01:47:35 +02:00
|
|
|
/* Area->type can be NULL when not yet initialized (for example when accessed
|
|
|
|
|
* through the outliner or API when not visible), or it can be wrong while
|
|
|
|
|
* the area type is changing.
|
|
|
|
|
* So manually do the lookup in those cases, but do not actually change area->type
|
|
|
|
|
* since that prevents a proper exit when the area type is changing.
|
2020-08-01 13:02:21 +10:00
|
|
|
* Logic copied from `ED_area_init()`.*/
|
2020-05-08 01:47:35 +02:00
|
|
|
SpaceType *type = area->type;
|
|
|
|
|
if (type == NULL || area_changing) {
|
|
|
|
|
type = BKE_spacetype_from_id(area_type);
|
|
|
|
|
if (type == NULL) {
|
|
|
|
|
type = BKE_spacetype_from_id(SPACE_VIEW3D);
|
2019-03-05 14:06:19 +01:00
|
|
|
}
|
2020-05-08 01:47:35 +02:00
|
|
|
BLI_assert(type != NULL);
|
2019-03-05 14:06:19 +01:00
|
|
|
}
|
2020-05-08 01:47:35 +02:00
|
|
|
if (type->space_subtype_item_extend != NULL) {
|
|
|
|
|
value |= area_changing ? area->butspacetype_subtype : type->space_subtype_get(area);
|
2018-05-29 09:19:06 +02:00
|
|
|
}
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void rna_Area_ui_type_set(PointerRNA *ptr, int value)
|
|
|
|
|
{
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area = ptr->data;
|
2018-05-31 17:59:35 +02:00
|
|
|
const int space_type = value >> 16;
|
|
|
|
|
SpaceType *st = BKE_spacetype_from_id(space_type);
|
|
|
|
|
|
|
|
|
|
rna_Area_type_set(ptr, space_type);
|
|
|
|
|
|
|
|
|
|
if (st && st->space_subtype_item_extend != NULL) {
|
2020-04-03 13:25:03 +02:00
|
|
|
area->butspacetype_subtype = value & 0xffff;
|
2018-05-29 09:19:06 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void rna_Area_ui_type_update(bContext *C, PointerRNA *ptr)
|
|
|
|
|
{
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area = ptr->data;
|
|
|
|
|
SpaceType *st = BKE_spacetype_from_id(area->butspacetype);
|
2018-05-31 17:59:35 +02:00
|
|
|
|
2018-05-29 09:19:06 +02:00
|
|
|
rna_Area_type_update(C, ptr);
|
2018-05-31 17:59:35 +02:00
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
if ((area->type == st) && (st->space_subtype_item_extend != NULL)) {
|
|
|
|
|
st->space_subtype_set(area, area->butspacetype_subtype);
|
2018-05-31 17:59:35 +02:00
|
|
|
}
|
2020-04-03 13:25:03 +02:00
|
|
|
area->butspacetype_subtype = 0;
|
Asset System: New Asset Browser editor
This introduces the User Interface part of the Asset Browser, based on the
design in T54642.
Additions:
* New Asset Browser (internally a sub-editor of the File Browser).
* Navigation region showing asset categories.
* Main region showing the assets of the selected asset library with previews.
The assets may be stored over multiple .blends in the directory that's
"mounted" as asset library in the Preferences. They will all be shown in this
list.
* Header with an asset library dropdown, allowing to choose the active asset
library to show. Options are the "Current File" as asset library and all
custom libraries.
* Display popover, filter popover and search box (partially dummies, see
T82680).
* Sidebar showing the metadata of the currently active file (name, preview,
description and tags), which can be edited for assets in the "Current File"
asset library. (For others it will reset on reload.)
* The sidebar includes a button to load a custom preview image from a file.
* Make asset files draggable (with preview image).
* If a library with invalid path is selected, a message is drawn in the main
region to help the user understand what's wrong.
* Operators to add and remove asset tags. Exposed in the sidebar.
* "Only Assets" option for Link/Append.
* Internal utilities for asset UI scripts.
For screenshots or demo videos, please see D9725. Or the 2.92 release notes.
Note that there are many things to be tweaked and polished in the Asset Browser
UI still. For example, the filter and display popovers are mostly dummies. See
T82680.
Part of the first Asset Browser milestone. Check the #asset_browser_milestone_1
project milestone on developer.blender.org.
Differential Revision: https://developer.blender.org/D9725
Reviewed by: Brecht Van Lommel, Hans Goudey
2020-12-14 14:07:42 +01:00
|
|
|
|
|
|
|
|
ED_area_tag_refresh(area);
|
2018-05-29 09:19:06 +02:00
|
|
|
}
|
|
|
|
|
|
2019-10-16 14:06:25 +11:00
|
|
|
static void rna_View2D_region_to_view(struct View2D *v2d, float x, float y, float result[2])
|
2012-08-08 16:44:16 +00:00
|
|
|
{
|
|
|
|
|
UI_view2d_region_to_view(v2d, x, y, &result[0], &result[1]);
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-01 15:47:09 +02:00
|
|
|
static void rna_View2D_view_to_region(
|
|
|
|
|
struct View2D *v2d, float x, float y, bool clip, int result[2])
|
2012-08-08 16:44:16 +00:00
|
|
|
{
|
2019-06-04 00:21:57 +10:00
|
|
|
if (clip) {
|
2014-04-21 16:47:16 +10:00
|
|
|
UI_view2d_view_to_region_clip(v2d, x, y, &result[0], &result[1]);
|
2019-06-04 00:21:57 +10:00
|
|
|
}
|
|
|
|
|
else {
|
2014-04-21 16:47:16 +10:00
|
|
|
UI_view2d_view_to_region(v2d, x, y, &result[0], &result[1]);
|
2019-06-04 00:21:57 +10:00
|
|
|
}
|
2012-08-08 16:44:16 +00:00
|
|
|
}
|
|
|
|
|
|
2020-08-19 11:55:45 +02:00
|
|
|
static const char *rna_Screen_statusbar_info_get(struct bScreen *UNUSED(screen),
|
|
|
|
|
Main *bmain,
|
|
|
|
|
bContext *C)
|
2020-07-18 07:49:25 -07:00
|
|
|
{
|
2020-08-19 11:55:45 +02:00
|
|
|
return ED_info_statusbar_string(bmain, CTX_data_scene(C), CTX_data_view_layer(C));
|
2020-07-18 07:49:25 -07:00
|
|
|
}
|
|
|
|
|
|
2008-11-29 01:04:15 +00:00
|
|
|
#else
|
|
|
|
|
|
2011-05-19 15:18:40 +00:00
|
|
|
/* Area.spaces */
|
|
|
|
|
static void rna_def_area_spaces(BlenderRNA *brna, PropertyRNA *cprop)
|
|
|
|
|
{
|
|
|
|
|
StructRNA *srna;
|
|
|
|
|
PropertyRNA *prop;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-05-19 15:18:40 +00:00
|
|
|
RNA_def_property_srna(cprop, "AreaSpaces");
|
2012-03-05 23:30:41 +00:00
|
|
|
srna = RNA_def_struct(brna, "AreaSpaces", NULL);
|
2011-05-19 15:18:40 +00:00
|
|
|
RNA_def_struct_sdna(srna, "ScrArea");
|
|
|
|
|
RNA_def_struct_ui_text(srna, "Area Spaces", "Collection of spaces");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
|
2011-05-19 15:18:40 +00:00
|
|
|
RNA_def_property_pointer_sdna(prop, NULL, "spacedata.first");
|
|
|
|
|
RNA_def_property_struct_type(prop, "Space");
|
|
|
|
|
RNA_def_property_ui_text(prop, "Active Space", "Space currently being displayed in this area");
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-08 05:59:28 +10:00
|
|
|
static void rna_def_area_api(StructRNA *srna)
|
|
|
|
|
{
|
|
|
|
|
FunctionRNA *func;
|
2018-09-08 06:23:25 +10:00
|
|
|
PropertyRNA *parm;
|
2018-09-08 05:59:28 +10:00
|
|
|
|
|
|
|
|
RNA_def_function(srna, "tag_redraw", "ED_area_tag_redraw");
|
|
|
|
|
|
2018-09-08 06:03:29 +10:00
|
|
|
func = RNA_def_function(srna, "header_text_set", "ED_area_status_text");
|
|
|
|
|
RNA_def_function_ui_description(func, "Set the header status text");
|
2018-10-30 16:16:41 +11:00
|
|
|
parm = RNA_def_string(
|
|
|
|
|
func, "text", NULL, 0, "Text", "New string for the header, None clears the text");
|
2018-09-08 06:23:25 +10:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2018-10-30 16:16:41 +11:00
|
|
|
RNA_def_property_clear_flag(parm, PROP_NEVER_NULL);
|
2018-09-08 05:59:28 +10:00
|
|
|
}
|
|
|
|
|
|
2009-08-16 15:34:30 +00:00
|
|
|
static void rna_def_area(BlenderRNA *brna)
|
2008-11-29 13:57:19 +00:00
|
|
|
{
|
|
|
|
|
StructRNA *srna;
|
2009-01-15 04:22:23 +00:00
|
|
|
PropertyRNA *prop;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
srna = RNA_def_struct(brna, "Area", NULL);
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_struct_ui_text(srna, "Area", "Area in a subdivided screen, containing an editor");
|
2008-11-29 13:57:19 +00:00
|
|
|
RNA_def_struct_sdna(srna, "ScrArea");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "spaces", PROP_COLLECTION, PROP_NONE);
|
2009-01-15 04:22:23 +00:00
|
|
|
RNA_def_property_collection_sdna(prop, NULL, "spacedata", NULL);
|
|
|
|
|
RNA_def_property_struct_type(prop, "Space");
|
2011-09-19 13:23:58 +00:00
|
|
|
RNA_def_property_ui_text(prop,
|
|
|
|
|
"Spaces",
|
2011-09-30 08:10:53 +00:00
|
|
|
"Spaces contained in this area, the first being the active space "
|
|
|
|
|
"(NOTE: Useful for example to restore a previously used 3D view space "
|
|
|
|
|
"in a certain area to get the old view orientation)");
|
2011-05-19 15:18:40 +00:00
|
|
|
rna_def_area_spaces(brna, prop);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "regions", PROP_COLLECTION, PROP_NONE);
|
2009-01-15 04:22:23 +00:00
|
|
|
RNA_def_property_collection_sdna(prop, NULL, "regionbase", NULL);
|
|
|
|
|
RNA_def_property_struct_type(prop, "Region");
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Regions", "Regions this area is subdivided in");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "show_menus", PROP_BOOLEAN, PROP_NONE);
|
UI: Layout Engine
* Buttons are now created first, and after that the layout is computed.
This means the layout engine now works at button level, and makes it
easier to write templates. Otherwise you had to store all info and
create the buttons later.
* Added interface_templates.c as a separate file to put templates in.
These can contain regular buttons, and can be put in a Free layout,
which means you can specify manual coordinates, but still get nested
correct inside other layouts.
* API was changed to allow better nesting. Previously items were added
in the last added layout specifier, i.e. one level up in the layout
hierarchy. This doesn't work well in always, so now when creating things
like rows or columns it always returns a layout which you have to add
the items in. All py scripts were updated to follow this.
* Computing the layout now goes in two passes, first estimating the
required width/height of all nested layouts, and then in the second
pass using the results of that to decide on the actual locations.
* Enum and array buttons now follow the direction of the layout, i.e.
they are vertical or horizontal depending if they are in a column or row.
* Color properties now get a color picker, and only get the additional
RGB sliders with Expand=True.
* File/directory string properties now get a button next to them for
opening the file browse, though this is not implemented yet.
* Layout items can now be aligned, set align=True when creating a column,
row, etc.
* Buttons now get a minimum width of one icon (avoids squashing icon
buttons).
* Moved some more space variables into Style.
2009-05-15 11:19:59 +00:00
|
|
|
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", HEADER_NO_PULLDOWN);
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Show Menus", "Show menus in the header");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
|
2009-10-13 17:50:14 +00:00
|
|
|
RNA_def_property_enum_sdna(prop, NULL, "spacetype");
|
2015-11-23 13:49:52 +11:00
|
|
|
RNA_def_property_enum_items(prop, rna_enum_space_type_items);
|
2013-09-29 13:25:42 +00:00
|
|
|
RNA_def_property_enum_default(prop, SPACE_VIEW3D);
|
2014-08-15 08:43:00 +10:00
|
|
|
RNA_def_property_enum_funcs(
|
|
|
|
|
prop, "rna_Area_type_get", "rna_Area_type_set", "rna_Area_type_itemf");
|
2013-06-09 16:18:23 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Editor Type", "Current editor type for this area");
|
2009-12-08 17:23:48 +00:00
|
|
|
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
|
2013-06-09 16:18:23 +00:00
|
|
|
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
2009-10-13 17:50:14 +00:00
|
|
|
RNA_def_property_update(prop, 0, "rna_Area_type_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-29 09:19:06 +02:00
|
|
|
prop = RNA_def_property(srna, "ui_type", PROP_ENUM, PROP_NONE);
|
2020-07-21 15:58:16 +10:00
|
|
|
RNA_def_property_enum_items(prop, DummyRNA_NULL_items); /* in fact dummy */
|
2019-03-13 09:11:50 +11:00
|
|
|
RNA_def_property_enum_default(prop, SPACE_VIEW3D << 16);
|
2018-05-29 09:19:06 +02:00
|
|
|
RNA_def_property_enum_funcs(
|
|
|
|
|
prop, "rna_Area_ui_type_get", "rna_Area_ui_type_set", "rna_Area_ui_type_itemf");
|
|
|
|
|
RNA_def_property_ui_text(prop, "Editor Type", "Current editor type for this area");
|
|
|
|
|
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
|
|
|
|
RNA_def_property_update(prop, 0, "rna_Area_ui_type_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-06-18 12:48:51 +00:00
|
|
|
prop = RNA_def_property(srna, "x", PROP_INT, PROP_NONE);
|
|
|
|
|
RNA_def_property_int_sdna(prop, NULL, "totrct.xmin");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_ui_text(
|
|
|
|
|
prop, "X Position", "The window relative vertical location of the area");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-06-18 12:48:51 +00:00
|
|
|
prop = RNA_def_property(srna, "y", PROP_INT, PROP_NONE);
|
|
|
|
|
RNA_def_property_int_sdna(prop, NULL, "totrct.ymin");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_ui_text(
|
|
|
|
|
prop, "Y Position", "The window relative horizontal location of the area");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "width", PROP_INT, PROP_UNSIGNED);
|
2011-03-29 05:49:34 +00:00
|
|
|
RNA_def_property_int_sdna(prop, NULL, "winx");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Width", "Area width");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "height", PROP_INT, PROP_UNSIGNED);
|
2011-03-29 05:49:34 +00:00
|
|
|
RNA_def_property_int_sdna(prop, NULL, "winy");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Height", "Area height");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-08 05:59:28 +10:00
|
|
|
rna_def_area_api(srna);
|
2008-11-29 13:57:19 +00:00
|
|
|
}
|
|
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
static void rna_def_view2d_api(StructRNA *srna)
|
|
|
|
|
{
|
|
|
|
|
FunctionRNA *func;
|
|
|
|
|
PropertyRNA *parm;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
static const float view_default[2] = {0.0f, 0.0f};
|
|
|
|
|
static const int region_default[2] = {0.0f, 0.0f};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
func = RNA_def_function(srna, "region_to_view", "rna_View2D_region_to_view");
|
|
|
|
|
RNA_def_function_ui_description(func, "Transform region coordinates to 2D view");
|
2019-10-16 14:06:25 +11:00
|
|
|
parm = RNA_def_float(func, "x", 0, -FLT_MAX, FLT_MAX, "x", "Region x coordinate", -10000, 10000);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2019-10-16 14:06:25 +11:00
|
|
|
parm = RNA_def_float(func, "y", 0, -FLT_MAX, FLT_MAX, "y", "Region y coordinate", -10000, 10000);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2012-08-08 16:44:16 +00:00
|
|
|
parm = RNA_def_float_array(func,
|
|
|
|
|
"result",
|
|
|
|
|
2,
|
|
|
|
|
view_default,
|
|
|
|
|
-FLT_MAX,
|
|
|
|
|
FLT_MAX,
|
|
|
|
|
"Result",
|
|
|
|
|
"View coordinates",
|
|
|
|
|
-10000.0f,
|
|
|
|
|
10000.0f);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, PROP_THICK_WRAP, 0);
|
2012-08-08 16:44:16 +00:00
|
|
|
RNA_def_function_output(func, parm);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
func = RNA_def_function(srna, "view_to_region", "rna_View2D_view_to_region");
|
|
|
|
|
RNA_def_function_ui_description(func, "Transform 2D view coordinates to region");
|
|
|
|
|
parm = RNA_def_float(
|
|
|
|
|
func, "x", 0.0f, -FLT_MAX, FLT_MAX, "x", "2D View x coordinate", -10000.0f, 10000.0f);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2012-08-08 16:44:16 +00:00
|
|
|
parm = RNA_def_float(
|
|
|
|
|
func, "y", 0.0f, -FLT_MAX, FLT_MAX, "y", "2D View y coordinate", -10000.0f, 10000.0f);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2012-08-08 16:44:16 +00:00
|
|
|
RNA_def_boolean(func, "clip", 1, "Clip", "Clip coordinates to the visible region");
|
|
|
|
|
parm = RNA_def_int_array(func,
|
|
|
|
|
"result",
|
|
|
|
|
2,
|
|
|
|
|
region_default,
|
|
|
|
|
INT_MIN,
|
|
|
|
|
INT_MAX,
|
|
|
|
|
"Result",
|
|
|
|
|
"Region coordinates",
|
|
|
|
|
-10000,
|
|
|
|
|
10000);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, PROP_THICK_WRAP, 0);
|
2012-08-08 16:44:16 +00:00
|
|
|
RNA_def_function_output(func, parm);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void rna_def_view2d(BlenderRNA *brna)
|
|
|
|
|
{
|
|
|
|
|
StructRNA *srna;
|
|
|
|
|
/* PropertyRNA *prop; */
|
|
|
|
|
|
|
|
|
|
srna = RNA_def_struct(brna, "View2D", NULL);
|
|
|
|
|
RNA_def_struct_ui_text(srna, "View2D", "Scroll and zoom for a 2D region");
|
|
|
|
|
RNA_def_struct_sdna(srna, "View2D");
|
2018-06-09 14:40:09 +02:00
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
/* TODO more View2D properties could be exposed here (read-only) */
|
2018-06-09 14:40:09 +02:00
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
rna_def_view2d_api(srna);
|
|
|
|
|
}
|
|
|
|
|
|
2009-01-15 04:22:23 +00:00
|
|
|
static void rna_def_region(BlenderRNA *brna)
|
2008-11-29 13:57:19 +00:00
|
|
|
{
|
|
|
|
|
StructRNA *srna;
|
2009-07-16 00:50:27 +00:00
|
|
|
PropertyRNA *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
|
|
|
static const EnumPropertyItem alignment_types[] = {
|
|
|
|
|
{RGN_ALIGN_NONE, "NONE", 0, "None", "Don't use any fixed alignment, fill available space"},
|
|
|
|
|
{RGN_ALIGN_TOP, "TOP", 0, "Top", ""},
|
|
|
|
|
{RGN_ALIGN_BOTTOM, "BOTTOM", 0, "Bottom", ""},
|
|
|
|
|
{RGN_ALIGN_LEFT, "LEFT", 0, "Left", ""},
|
|
|
|
|
{RGN_ALIGN_RIGHT, "RIGHT", 0, "Right", ""},
|
|
|
|
|
{RGN_ALIGN_HSPLIT, "HORIZONTAL_SPLIT", 0, "Horizontal Split", ""},
|
|
|
|
|
{RGN_ALIGN_VSPLIT, "VERTICAL_SPLIT", 0, "Vertical Split", ""},
|
|
|
|
|
{RGN_ALIGN_FLOAT,
|
|
|
|
|
"FLOAT",
|
|
|
|
|
0,
|
|
|
|
|
"Float",
|
|
|
|
|
"Region floats on screen, doesn't use any fixed alignment"},
|
|
|
|
|
{RGN_ALIGN_QSPLIT,
|
|
|
|
|
"QUAD_SPLIT",
|
|
|
|
|
0,
|
|
|
|
|
"Quad Split",
|
|
|
|
|
"Region is split horizontally and vertically"},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
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
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
srna = RNA_def_struct(brna, "Region", NULL);
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_struct_ui_text(srna, "Region", "Region in a subdivided screen area");
|
2008-11-29 13:57:19 +00:00
|
|
|
RNA_def_struct_sdna(srna, "ARegion");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
|
2010-01-01 20:50:58 +00:00
|
|
|
RNA_def_property_enum_sdna(prop, NULL, "regiontype");
|
2015-11-23 13:49:52 +11:00
|
|
|
RNA_def_property_enum_items(prop, rna_enum_region_type_items);
|
2009-12-19 21:33:25 +00:00
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Region Type", "Type of this region");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-06-18 12:48:51 +00:00
|
|
|
prop = RNA_def_property(srna, "x", PROP_INT, PROP_NONE);
|
|
|
|
|
RNA_def_property_int_sdna(prop, NULL, "winrct.xmin");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_ui_text(
|
|
|
|
|
prop, "X Position", "The window relative vertical location of the region");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-06-18 12:48:51 +00:00
|
|
|
prop = RNA_def_property(srna, "y", PROP_INT, PROP_NONE);
|
|
|
|
|
RNA_def_property_int_sdna(prop, NULL, "winrct.ymin");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_ui_text(
|
|
|
|
|
prop, "Y Position", "The window relative horizontal location of the region");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "width", PROP_INT, PROP_UNSIGNED);
|
2009-11-11 20:42:18 +00:00
|
|
|
RNA_def_property_int_sdna(prop, NULL, "winx");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Width", "Region width");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "height", PROP_INT, PROP_UNSIGNED);
|
2009-11-11 20:42:18 +00:00
|
|
|
RNA_def_property_int_sdna(prop, NULL, "winy");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Height", "Region height");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-08-08 16:44:16 +00:00
|
|
|
prop = RNA_def_property(srna, "view2d", PROP_POINTER, PROP_NONE);
|
|
|
|
|
RNA_def_property_pointer_sdna(prop, NULL, "v2d");
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_flag(prop, PROP_NEVER_NULL);
|
|
|
|
|
RNA_def_property_ui_text(prop, "View2D", "2D view of the region");
|
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
|
|
|
prop = RNA_def_property(srna, "alignment", PROP_ENUM, PROP_NONE);
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_enum_items(prop, alignment_types);
|
|
|
|
|
RNA_def_property_enum_funcs(prop, "rna_region_alignment_get", NULL, NULL);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Alignment", "Alignment of the region within the area");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-11-20 05:11:10 +00:00
|
|
|
RNA_def_function(srna, "tag_redraw", "ED_region_tag_redraw");
|
2008-11-29 13:57:19 +00:00
|
|
|
}
|
|
|
|
|
|
2009-08-16 15:34:30 +00:00
|
|
|
static void rna_def_screen(BlenderRNA *brna)
|
2008-11-29 01:04:15 +00:00
|
|
|
{
|
|
|
|
|
StructRNA *srna;
|
|
|
|
|
PropertyRNA *prop;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-07-18 07:49:25 -07:00
|
|
|
FunctionRNA *func;
|
|
|
|
|
PropertyRNA *parm;
|
|
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
srna = RNA_def_struct(brna, "Screen", "ID");
|
2009-01-15 04:22:23 +00:00
|
|
|
RNA_def_struct_sdna(srna, "Screen"); /* it is actually bScreen but for 2.5 the dna is patched! */
|
2015-10-24 02:44:43 +11:00
|
|
|
RNA_def_struct_ui_text(
|
|
|
|
|
srna, "Screen", "Screen data-block, defining the layout of areas in a window");
|
2018-10-01 10:45:50 +02:00
|
|
|
RNA_def_struct_ui_icon(srna, ICON_WORKSPACE);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-02-01 23:41:01 +00:00
|
|
|
/* collections */
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "areas", PROP_COLLECTION, PROP_NONE);
|
2009-01-15 04:22:23 +00:00
|
|
|
RNA_def_property_collection_sdna(prop, NULL, "areabase", NULL);
|
2009-01-10 22:57:33 +00:00
|
|
|
RNA_def_property_struct_type(prop, "Area");
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Areas", "Areas the screen is subdivided into");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-02-01 23:41:01 +00:00
|
|
|
/* readonly status indicators */
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "is_animation_playing", PROP_BOOLEAN, PROP_NONE);
|
2009-08-16 15:34:30 +00:00
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
2010-08-18 07:14:10 +00:00
|
|
|
RNA_def_property_boolean_funcs(prop, "rna_Screen_is_animation_playing_get", NULL);
|
2010-02-10 21:15:44 +00:00
|
|
|
RNA_def_property_ui_text(prop, "Animation Playing", "Animation playback is active");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-07-13 15:26:00 +02:00
|
|
|
prop = RNA_def_property(srna, "is_scrubbing", PROP_BOOLEAN, PROP_NONE);
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_boolean_funcs(prop, "rna_Screen_is_scrubbing_get", NULL);
|
|
|
|
|
RNA_def_property_ui_text(
|
|
|
|
|
prop, "User is Scrubbing", "True when the user is scrubbing through time");
|
|
|
|
|
|
2019-06-29 13:38:12 +10:00
|
|
|
prop = RNA_def_property(srna, "is_temporary", PROP_BOOLEAN, PROP_NONE);
|
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "temp", 1);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Temporary", "");
|
|
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "show_fullscreen", PROP_BOOLEAN, PROP_NONE);
|
2009-12-08 07:12:06 +00:00
|
|
|
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
|
|
|
RNA_def_property_boolean_funcs(prop, "rna_Screen_fullscreen_get", NULL);
|
2014-10-14 15:05:44 -03:00
|
|
|
RNA_def_property_ui_text(prop, "Maximize", "An area is maximized, filling this screen");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-07-18 07:49:25 -07:00
|
|
|
/* Status Bar. */
|
|
|
|
|
|
2018-08-17 17:32:36 +02:00
|
|
|
prop = RNA_def_property(srna, "show_statusbar", PROP_BOOLEAN, PROP_NONE);
|
|
|
|
|
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SCREEN_COLLAPSE_STATUSBAR);
|
2020-12-13 13:12:56 -08:00
|
|
|
RNA_def_property_ui_text(prop, "Show Status Bar", "Show status bar");
|
2018-08-17 17:32:36 +02:00
|
|
|
RNA_def_property_update(prop, 0, "rna_Screen_bar_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-07-18 07:49:25 -07:00
|
|
|
func = RNA_def_function(srna, "statusbar_info", "rna_Screen_statusbar_info_get");
|
|
|
|
|
RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_CONTEXT);
|
|
|
|
|
parm = RNA_def_string(func, "statusbar_info", NULL, 0, "Status Bar Info", "");
|
|
|
|
|
RNA_def_function_return(func, parm);
|
|
|
|
|
|
2011-02-01 23:41:01 +00:00
|
|
|
/* Define Anim Playback Areas */
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_top_left_3d_editor", PROP_BOOLEAN, PROP_NONE);
|
2011-02-01 23:41:01 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_REGION);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Top-Left 3D Editor", "");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_3d_editors", PROP_BOOLEAN, PROP_NONE);
|
2011-02-01 23:41:01 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_ALL_3D_WIN);
|
2019-06-30 12:23:30 -04:00
|
|
|
RNA_def_property_ui_text(prop, "All 3D Viewports", "");
|
2015-02-05 22:14:38 +01:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-02-05 22:14:38 +01:00
|
|
|
prop = RNA_def_property(srna, "use_follow", PROP_BOOLEAN, PROP_NONE);
|
|
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_FOLLOW);
|
2015-02-12 22:05:47 +01:00
|
|
|
RNA_def_property_ui_text(prop, "Follow", "Follow current frame in editors");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_animation_editors", PROP_BOOLEAN, PROP_NONE);
|
2011-02-01 23:41:01 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_ALL_ANIM_WIN);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Animation Editors", "");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_properties_editors", PROP_BOOLEAN, PROP_NONE);
|
2011-02-01 23:41:01 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_ALL_BUTS_WIN);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Property Editors", "");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_image_editors", PROP_BOOLEAN, PROP_NONE);
|
2011-02-01 23:41:01 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_ALL_IMAGE_WIN);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Image Editors", "");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_sequence_editors", PROP_BOOLEAN, PROP_NONE);
|
2011-02-01 23:41:01 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_SEQ);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Sequencer Editors", "");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_node_editors", PROP_BOOLEAN, PROP_NONE);
|
2011-02-01 23:41:01 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_NODES);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Node Editors", "");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
prop = RNA_def_property(srna, "use_play_clip_editors", PROP_BOOLEAN, PROP_NONE);
|
2011-11-07 12:55:18 +00:00
|
|
|
RNA_def_property_boolean_sdna(prop, NULL, "redraws_flag", TIME_CLIPS);
|
|
|
|
|
RNA_def_property_ui_text(prop, "Clip Editors", "");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Screen_redraw_update");
|
2008-11-29 13:57:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void RNA_def_screen(BlenderRNA *brna)
|
|
|
|
|
{
|
2009-08-16 15:34:30 +00:00
|
|
|
rna_def_screen(brna);
|
|
|
|
|
rna_def_area(brna);
|
2009-01-15 04:22:23 +00:00
|
|
|
rna_def_region(brna);
|
2012-08-08 16:44:16 +00:00
|
|
|
rna_def_view2d(brna);
|
2008-11-29 01:04:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|