2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2008-01-07 18:03:41 +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-06-01 18:19:39 +02:00
|
|
|
* of the License, or (at your option) any later version.
|
2008-01-07 18:03:41 +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.
|
2008-01-07 18:03:41 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2008 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*/
|
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
* \ingroup edscr
|
2011-02-27 20:29:51 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2009-02-15 13:09:19 +00:00
|
|
|
#include <math.h>
|
2009-10-28 18:03:04 +00:00
|
|
|
#include <string.h>
|
2009-02-15 13:09:19 +00:00
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2009-11-10 20:43:45 +00:00
|
|
|
#include "BLI_math.h"
|
2.5: Space Image ported back
Organized as follows:
uvedit/
uv editing related code
uvedit_draw.c: drawing code
uvedit_ops.c: operators, just a few done
uvedit_unwrap_ops.c: will be operators for unwrapping
uvedit_paramatrizer.c: lscm/abf/stretch/pack
space_image/
space_image.c: registration and common getter/setters
image_draw.c: drawing code, mostly functional
image_panels.c: panels, all commented out
image_render.c: render callbacks, non functional
image_ops.c: operators, only view navigation done
image_header.c: header, menus mostly done but missing buttons
Notes:
* Header menus consist only of Operator and RNA buttons, if they
are not implemented they're displayed grayed out. Ideally the full
header could work like this, but std_libbuttons looks problematic.
* Started using view2d code more than the old code, but for now it
still does own view2d management due to some very specific
requirements that the image window has. The drawing code however
is more clear hopefully, it only uses view2d, and there is no
switching between 'p' and 'f' view2d's anymore, it is always 'f'.
* In order to make uvedit operators more independent I move some
image space settings to scene toolsettings, and the current image
and its buffer is in the context. Especially sync selection and
select mode belonged there anyway as this cannot work correct with
different spaces having different settings anyway.
* Image paint is not back yet, did not want to put that together with
uvedit because there's really no code sharing.. perhaps vertex paint,
image paint and sculpt would be good to have in one module to share
brush code, partial redraw, etc better.
2009-01-15 04:38:18 +00:00
|
|
|
#include "BLI_blenlib.h"
|
2009-07-24 13:34:45 +00:00
|
|
|
#include "BLI_dlrbTree.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2012-05-19 09:46:41 +00:00
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
#include "DNA_anim_types.h"
|
2009-02-04 17:40:50 +00:00
|
|
|
#include "DNA_armature_types.h"
|
2009-07-03 15:23:33 +00:00
|
|
|
#include "DNA_lattice_types.h"
|
2009-02-04 17:40:50 +00:00
|
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "DNA_curve_types.h"
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
#include "DNA_gpencil_types.h"
|
2009-02-04 17:40:50 +00:00
|
|
|
#include "DNA_scene_types.h"
|
2009-07-29 12:35:09 +00:00
|
|
|
#include "DNA_meta_types.h"
|
2018-05-25 22:24:24 +05:30
|
|
|
#include "DNA_mesh_types.h"
|
2012-06-04 16:42:58 +00:00
|
|
|
#include "DNA_mask_types.h"
|
2013-03-18 16:34:57 +00:00
|
|
|
#include "DNA_node_types.h"
|
2017-06-13 12:02:08 +02:00
|
|
|
#include "DNA_workspace_types.h"
|
2012-02-12 11:42:17 +00:00
|
|
|
#include "DNA_userdef_types.h"
|
2009-02-04 17:40:50 +00:00
|
|
|
|
2008-12-18 02:56:48 +00:00
|
|
|
#include "BKE_context.h"
|
2.5: Space Image ported back
Organized as follows:
uvedit/
uv editing related code
uvedit_draw.c: drawing code
uvedit_ops.c: operators, just a few done
uvedit_unwrap_ops.c: will be operators for unwrapping
uvedit_paramatrizer.c: lscm/abf/stretch/pack
space_image/
space_image.c: registration and common getter/setters
image_draw.c: drawing code, mostly functional
image_panels.c: panels, all commented out
image_render.c: render callbacks, non functional
image_ops.c: operators, only view navigation done
image_header.c: header, menus mostly done but missing buttons
Notes:
* Header menus consist only of Operator and RNA buttons, if they
are not implemented they're displayed grayed out. Ideally the full
header could work like this, but std_libbuttons looks problematic.
* Started using view2d code more than the old code, but for now it
still does own view2d management due to some very specific
requirements that the image window has. The drawing code however
is more clear hopefully, it only uses view2d, and there is no
switching between 'p' and 'f' view2d's anymore, it is always 'f'.
* In order to make uvedit operators more independent I move some
image space settings to scene toolsettings, and the current image
and its buffer is in the context. Especially sync selection and
select mode belonged there anyway as this cannot work correct with
different spaces having different settings anyway.
* Image paint is not back yet, did not want to put that together with
uvedit because there's really no code sharing.. perhaps vertex paint,
image paint and sculpt would be good to have in one module to share
brush code, partial redraw, etc better.
2009-01-15 04:38:18 +00:00
|
|
|
#include "BKE_customdata.h"
|
2018-11-07 15:37:31 +01:00
|
|
|
#include "BKE_editmesh.h"
|
2018-05-22 16:18:09 +02:00
|
|
|
#include "BKE_fcurve.h"
|
2011-04-07 15:48:33 +00:00
|
|
|
#include "BKE_global.h"
|
2016-12-01 16:43:57 +01:00
|
|
|
#include "BKE_icons.h"
|
2018-11-07 15:37:31 +01:00
|
|
|
#include "BKE_library.h"
|
2008-01-07 18:03:41 +00:00
|
|
|
#include "BKE_main.h"
|
2018-11-07 15:37:31 +01:00
|
|
|
#include "BKE_mask.h"
|
2011-09-14 01:48:55 +00:00
|
|
|
#include "BKE_object.h"
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
#include "BKE_report.h"
|
2009-08-15 16:43:03 +00:00
|
|
|
#include "BKE_scene.h"
|
2008-01-07 18:03:41 +00:00
|
|
|
#include "BKE_screen.h"
|
2009-08-09 21:16:39 +00:00
|
|
|
#include "BKE_sound.h"
|
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
|
|
|
#include "BKE_workspace.h"
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
2018-02-06 17:28:00 +11:00
|
|
|
#include "DEG_depsgraph.h"
|
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
#include "ED_anim_api.h"
|
2012-07-25 12:15:22 +00:00
|
|
|
#include "ED_armature.h"
|
|
|
|
#include "ED_clip.h"
|
2010-12-20 05:26:25 +00:00
|
|
|
#include "ED_image.h"
|
2012-07-25 12:15:22 +00:00
|
|
|
#include "ED_keyframes_draw.h"
|
2009-07-02 03:32:57 +00:00
|
|
|
#include "ED_object.h"
|
2012-07-25 12:15:22 +00:00
|
|
|
#include "ED_screen.h"
|
2008-11-19 16:28:11 +00:00
|
|
|
#include "ED_screen_types.h"
|
2012-07-25 12:15:22 +00:00
|
|
|
#include "ED_sequencer.h"
|
|
|
|
#include "ED_util.h"
|
2018-04-02 15:02:08 +02:00
|
|
|
#include "ED_undo.h"
|
2011-03-08 07:44:30 +00:00
|
|
|
#include "ED_view3d.h"
|
2009-02-04 17:40:50 +00:00
|
|
|
|
2008-11-21 19:14:38 +00:00
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "RNA_define.h"
|
2018-11-29 18:13:01 +11:00
|
|
|
#include "RNA_enum_types.h"
|
2008-11-21 19:14:38 +00:00
|
|
|
|
2009-01-15 18:28:40 +00:00
|
|
|
#include "UI_interface.h"
|
2010-12-17 19:05:34 +00:00
|
|
|
#include "UI_resources.h"
|
2015-06-29 20:46:23 +10:00
|
|
|
#include "UI_view2d.h"
|
2009-10-28 18:03:04 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
#include "screen_intern.h" /* own module include */
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
#define KM_MODAL_CANCEL 1
|
|
|
|
#define KM_MODAL_APPLY 2
|
2018-01-18 11:22:58 +11:00
|
|
|
#define KM_MODAL_SNAP_ON 3
|
|
|
|
#define KM_MODAL_SNAP_OFF 4
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Public Poll API
|
|
|
|
* \{ */
|
2008-01-10 17:38:17 +00:00
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_regionactive(bContext *C)
|
2009-02-19 23:53:40 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
if (CTX_wm_window(C) == NULL) return 0;
|
|
|
|
if (CTX_wm_screen(C) == NULL) return 0;
|
|
|
|
if (CTX_wm_region(C) == NULL) return 0;
|
2009-02-19 23:53:40 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_areaactive(bContext *C)
|
2.5 getting-back-into-coding commit :)
- cleaned up join and split operations. Most noticable is operator callback
design, which should make a design based on user-less exec() first, then
wrap invoke() and modal() around it. The exec() should be callable with
only Context and properties.
- split now works again; and inversed as previously, if you drag from a
triangle (action zone) inside area it subdivides area as expected.
- dragging from triangle outside area, over an edge, joins areas
- split has been simplified, it had too many options... it could just work
simpler (now)
- 'action zone' now is an operator itself, a widget sending an ACTIONZONE event,
which can be handled by others (so other gestures can be added in action zone
too)
Still evaluating:
- context gets set where?
- code structure confuses... what are proper functions for operators?
- what is WM... should low level screen stuff more there?
- when do you send event, notifier?
- files grow to large, will clean
Oh yeah and docs, docs, docs. Coming! :)
2008-11-17 18:54:03 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
if (CTX_wm_window(C) == NULL) return 0;
|
|
|
|
if (CTX_wm_screen(C) == NULL) return 0;
|
|
|
|
if (CTX_wm_area(C) == NULL) return 0;
|
2.5 getting-back-into-coding commit :)
- cleaned up join and split operations. Most noticable is operator callback
design, which should make a design based on user-less exec() first, then
wrap invoke() and modal() around it. The exec() should be callable with
only Context and properties.
- split now works again; and inversed as previously, if you drag from a
triangle (action zone) inside area it subdivides area as expected.
- dragging from triangle outside area, over an edge, joins areas
- split has been simplified, it had too many options... it could just work
simpler (now)
- 'action zone' now is an operator itself, a widget sending an ACTIONZONE event,
which can be handled by others (so other gestures can be added in action zone
too)
Still evaluating:
- context gets set where?
- code structure confuses... what are proper functions for operators?
- what is WM... should low level screen stuff more there?
- when do you send event, notifier?
- files grow to large, will clean
Oh yeah and docs, docs, docs. Coming! :)
2008-11-17 18:54:03 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_screenactive(bContext *C)
|
2008-01-07 18:03:41 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
if (CTX_wm_window(C) == NULL) return 0;
|
|
|
|
if (CTX_wm_screen(C) == NULL) return 0;
|
2008-01-07 18:03:41 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2011-04-07 15:48:33 +00:00
|
|
|
/* XXX added this to prevent anim state to change during renders */
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool ED_operator_screenactive_norender(bContext *C)
|
2011-04-07 15:48:33 +00:00
|
|
|
{
|
2012-08-08 18:37:06 +00:00
|
|
|
if (G.is_rendering) return 0;
|
2012-05-08 11:48:19 +00:00
|
|
|
if (CTX_wm_window(C) == NULL) return 0;
|
|
|
|
if (CTX_wm_screen(C) == NULL) return 0;
|
2011-04-07 15:48:33 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2.5 getting-back-into-coding commit :)
- cleaned up join and split operations. Most noticable is operator callback
design, which should make a design based on user-less exec() first, then
wrap invoke() and modal() around it. The exec() should be callable with
only Context and properties.
- split now works again; and inversed as previously, if you drag from a
triangle (action zone) inside area it subdivides area as expected.
- dragging from triangle outside area, over an edge, joins areas
- split has been simplified, it had too many options... it could just work
simpler (now)
- 'action zone' now is an operator itself, a widget sending an ACTIONZONE event,
which can be handled by others (so other gestures can be added in action zone
too)
Still evaluating:
- context gets set where?
- code structure confuses... what are proper functions for operators?
- what is WM... should low level screen stuff more there?
- when do you send event, notifier?
- files grow to large, will clean
Oh yeah and docs, docs, docs. Coming! :)
2008-11-17 18:54:03 +00:00
|
|
|
/* when mouse is over area-edge */
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_screen_mainwinactive(bContext *C)
|
2008-01-07 18:03:41 +00:00
|
|
|
{
|
2012-12-14 16:10:46 +00:00
|
|
|
bScreen *screen;
|
2012-05-08 11:48:19 +00:00
|
|
|
if (CTX_wm_window(C) == NULL) return 0;
|
2012-12-14 16:10:46 +00:00
|
|
|
screen = CTX_wm_screen(C);
|
|
|
|
if (screen == NULL) return 0;
|
2018-02-16 22:41:46 +01:00
|
|
|
if (screen->active_region != NULL) return 0;
|
2008-01-10 17:38:17 +00:00
|
|
|
return 1;
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_scene(bContext *C)
|
2018-05-24 16:40:33 +02:00
|
|
|
{
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
if (scene)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_scene_editable(bContext *C)
|
2009-01-01 14:57:04 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2017-11-06 17:17:10 +01:00
|
|
|
if (scene && !ID_IS_LINKED(scene))
|
2009-01-01 14:57:04 +00:00
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_objectmode(bContext *C)
|
2010-11-12 17:35:51 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
Object *obact = CTX_data_active_object(C);
|
2010-11-12 17:35:51 +00:00
|
|
|
|
2017-11-06 17:17:10 +01:00
|
|
|
if (scene == NULL || ID_IS_LINKED(scene))
|
2010-11-12 17:35:51 +00:00
|
|
|
return 0;
|
2014-01-16 19:15:53 +11:00
|
|
|
if (CTX_data_edit_object(C))
|
2010-11-12 17:35:51 +00:00
|
|
|
return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-11-12 17:35:51 +00:00
|
|
|
/* add a check for ob->mode too? */
|
2018-04-05 18:20:27 +02:00
|
|
|
if (obact && (obact->mode != OB_MODE_OBJECT))
|
2010-11-12 17:35:51 +00:00
|
|
|
return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-11-12 17:35:51 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-22 02:48:11 +11:00
|
|
|
static bool ed_spacetype_test(bContext *C, int type)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ED_operator_areaactive(C)) {
|
2012-05-08 11:48:19 +00:00
|
|
|
SpaceLink *sl = (SpaceLink *)CTX_wm_space_data(C);
|
2008-12-26 19:07:31 +00:00
|
|
|
return sl && (sl->spacetype == type);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_view3d_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_VIEW3D);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_region_view3d_active(bContext *C)
|
2010-09-27 10:44:46 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (CTX_wm_region_view3d(C))
|
2014-04-01 11:34:00 +11:00
|
|
|
return true;
|
2010-11-04 15:59:09 +00:00
|
|
|
|
2010-09-27 12:21:23 +00:00
|
|
|
CTX_wm_operator_poll_msg_set(C, "expected a view3d region");
|
2014-04-01 11:34:00 +11:00
|
|
|
return false;
|
2010-09-27 10:44:46 +00:00
|
|
|
}
|
|
|
|
|
2010-11-04 15:59:09 +00:00
|
|
|
/* generic for any view2d which uses anim_ops */
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_animview_active(bContext *C)
|
2010-11-04 15:59:09 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ED_operator_areaactive(C)) {
|
2012-05-08 11:48:19 +00:00
|
|
|
SpaceLink *sl = (SpaceLink *)CTX_wm_space_data(C);
|
2019-02-16 16:42:11 +11:00
|
|
|
if (sl && (ELEM(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_GRAPH)))
|
2014-04-01 11:34:00 +11:00
|
|
|
return true;
|
2010-11-04 15:59:09 +00:00
|
|
|
}
|
|
|
|
|
2013-02-28 15:31:20 +00:00
|
|
|
CTX_wm_operator_poll_msg_set(C, "expected a timeline/animation area to be active");
|
2010-11-04 15:59:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_outliner_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
2009-03-26 14:05:33 +00:00
|
|
|
return ed_spacetype_test(C, SPACE_OUTLINER);
|
2008-12-26 19:07:31 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_outliner_active_no_editobject(bContext *C)
|
2010-09-27 21:22:20 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ed_spacetype_test(C, SPACE_OUTLINER)) {
|
2010-09-27 21:22:20 +00:00
|
|
|
Object *ob = ED_object_active_context(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ob && ob == obedit)
|
2010-09-27 21:22:20 +00:00
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_file_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_FILE);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_action_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_ACTION);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_buttons_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
2019-02-16 10:44:15 +11:00
|
|
|
return ed_spacetype_test(C, SPACE_PROPERTIES);
|
2008-12-26 19:07:31 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_node_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
SpaceNode *snode = CTX_wm_space_node(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-03-19 13:40:16 +00:00
|
|
|
if (snode && snode->edittree)
|
2009-07-28 16:33:02 +00:00
|
|
|
return 1;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-10 15:51:33 +00:00
|
|
|
return 0;
|
2008-12-26 19:07:31 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_node_editable(bContext *C)
|
2013-06-05 19:06:33 +00:00
|
|
|
{
|
|
|
|
SpaceNode *snode = CTX_wm_space_node(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2017-11-06 17:17:10 +01:00
|
|
|
if (snode && snode->edittree && !ID_IS_LINKED(snode->edittree))
|
2013-06-05 19:06:33 +00:00
|
|
|
return 1;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-06-05 19:06:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_graphedit_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
2019-02-16 16:42:11 +11:00
|
|
|
return ed_spacetype_test(C, SPACE_GRAPH);
|
2008-12-26 19:07:31 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_sequencer_active(bContext *C)
|
2008-12-26 19:07:31 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_SEQ);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_sequencer_active_editable(bContext *C)
|
2014-02-26 13:21:48 +11:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_SEQ) && ED_operator_scene_editable(C);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_image_active(bContext *C)
|
2009-02-04 17:40:50 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_IMAGE);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_nla_active(bContext *C)
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_NLA);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_info_active(bContext *C)
|
2010-11-11 13:36:57 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_INFO);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_console_active(bContext *C)
|
2010-11-11 13:36:57 +00:00
|
|
|
{
|
|
|
|
return ed_spacetype_test(C, SPACE_CONSOLE);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool ed_object_hidden(Object *ob)
|
2012-11-21 03:33:34 +00:00
|
|
|
{
|
|
|
|
/* if hidden but in edit mode, we still display, can happen with animation */
|
2018-04-05 18:20:27 +02:00
|
|
|
return ((ob->restrictflag & OB_RESTRICT_VIEW) && !(ob->mode & OB_MODE_EDIT));
|
2012-11-21 03:33:34 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_object_active(bContext *C)
|
2009-01-01 13:15:35 +00:00
|
|
|
{
|
2010-09-06 22:10:51 +00:00
|
|
|
Object *ob = ED_object_active_context(C);
|
2018-04-05 18:20:27 +02:00
|
|
|
return ((ob != NULL) && !ed_object_hidden(ob));
|
2009-01-01 13:15:35 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_object_active_editable(bContext *C)
|
2009-12-04 06:33:01 +00:00
|
|
|
{
|
2010-03-31 00:55:01 +00:00
|
|
|
Object *ob = ED_object_active_context(C);
|
2018-04-05 18:20:27 +02:00
|
|
|
return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob));
|
2009-12-04 06:33:01 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_object_active_editable_mesh(bContext *C)
|
2010-11-04 15:59:09 +00:00
|
|
|
{
|
|
|
|
Object *ob = ED_object_active_context(C);
|
2018-04-05 18:20:27 +02:00
|
|
|
return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob) &&
|
2017-11-06 17:17:10 +01:00
|
|
|
(ob->type == OB_MESH) && !ID_IS_LINKED(ob->data));
|
2009-12-04 06:33:01 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_object_active_editable_font(bContext *C)
|
2011-03-15 08:38:08 +00:00
|
|
|
{
|
|
|
|
Object *ob = ED_object_active_context(C);
|
2018-04-05 18:20:27 +02:00
|
|
|
return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob) &&
|
2012-05-27 11:10:27 +00:00
|
|
|
(ob->type == OB_FONT));
|
2011-03-15 08:38:08 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editmesh(bContext *C)
|
2009-01-01 13:15:35 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_MESH)
|
2013-04-16 05:59:48 +00:00
|
|
|
return NULL != BKE_editmesh_from_object(obedit);
|
2009-01-01 13:15:35 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editmesh_view3d(bContext *C)
|
2009-12-06 17:38:39 +00:00
|
|
|
{
|
|
|
|
return ED_operator_editmesh(C) && ED_operator_view3d_active(C);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editmesh_region_view3d(bContext *C)
|
2010-09-27 05:44:15 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ED_operator_editmesh(C) && CTX_wm_region_view3d(C))
|
2010-10-08 11:33:10 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
CTX_wm_operator_poll_msg_set(C, "expected a view3d region & editmesh");
|
|
|
|
return 0;
|
2010-09-27 05:44:15 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 23:31:19 +05:30
|
|
|
bool ED_operator_editmesh_auto_smooth(bContext *C)
|
2018-05-25 22:24:24 +05:30
|
|
|
{
|
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_MESH && (((Mesh *)(obedit->data))->flag & ME_AUTOSMOOTH)) {
|
|
|
|
return NULL != BKE_editmesh_from_object(obedit);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editarmature(bContext *C)
|
2009-02-01 18:07:02 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_ARMATURE)
|
2009-02-01 18:07:02 +00:00
|
|
|
return NULL != ((bArmature *)obedit->data)->edbo;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-09-06 23:10:01 +00:00
|
|
|
/**
|
|
|
|
* \brief check for pose mode (no mixed modes)
|
|
|
|
*
|
2013-02-06 14:02:19 +00:00
|
|
|
* We want to enable most pose operations in weight paint mode,
|
2015-02-23 12:23:13 +01:00
|
|
|
* when it comes to transforming bones, but managing bones layers/groups
|
2012-09-06 23:10:01 +00:00
|
|
|
* can be left for pose mode only. (not weight paint mode)
|
|
|
|
*/
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_posemode_exclusive(bContext *C)
|
2012-09-06 23:10:01 +00:00
|
|
|
{
|
|
|
|
Object *obact = CTX_data_active_object(C);
|
|
|
|
|
2018-04-05 18:20:27 +02:00
|
|
|
if (obact && !(obact->mode & OB_MODE_EDIT)) {
|
|
|
|
Object *obpose;
|
|
|
|
if ((obpose = BKE_object_pose_armature_get(obact))) {
|
|
|
|
if (obact == obpose) {
|
|
|
|
return 1;
|
2012-09-06 23:10:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-09-23 02:31:30 +00:00
|
|
|
/* allows for pinned pose objects to be used in the object buttons
|
2014-10-29 14:11:19 +01:00
|
|
|
* and the non-active pose object to be used in the 3D view */
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_posemode_context(bContext *C)
|
2012-09-23 02:31:30 +00:00
|
|
|
{
|
|
|
|
Object *obpose = ED_pose_object_from_context(C);
|
|
|
|
|
2018-04-05 18:20:27 +02:00
|
|
|
if (obpose && !(obpose->mode & OB_MODE_EDIT)) {
|
|
|
|
if (BKE_object_pose_context_check(obpose)) {
|
|
|
|
return 1;
|
2012-09-23 02:31:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_posemode(bContext *C)
|
2009-02-01 18:07:02 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obact = CTX_data_active_object(C);
|
2010-10-14 03:57:15 +00:00
|
|
|
|
2018-04-05 18:20:27 +02:00
|
|
|
if (obact && !(obact->mode & OB_MODE_EDIT)) {
|
|
|
|
Object *obpose;
|
|
|
|
if ((obpose = BKE_object_pose_armature_get(obact))) {
|
|
|
|
if ((obact == obpose) || (obact->mode & OB_MODE_WEIGHT_PAINT)) {
|
|
|
|
return 1;
|
2010-10-14 03:57:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-02-01 18:07:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_posemode_local(bContext *C)
|
2016-11-16 10:39:41 +01:00
|
|
|
{
|
|
|
|
if (ED_operator_posemode(C)) {
|
|
|
|
Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
|
|
|
|
bArmature *arm = ob->data;
|
2017-11-06 17:17:10 +01:00
|
|
|
return !(ID_IS_LINKED(&ob->id) ||
|
|
|
|
ID_IS_LINKED(&arm->id));
|
2016-11-16 10:39:41 +01:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-12-20 05:26:25 +00:00
|
|
|
/* wrapper for ED_space_image_show_uvedit */
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_uvedit(bContext *C)
|
2.5: Space Image ported back
Organized as follows:
uvedit/
uv editing related code
uvedit_draw.c: drawing code
uvedit_ops.c: operators, just a few done
uvedit_unwrap_ops.c: will be operators for unwrapping
uvedit_paramatrizer.c: lscm/abf/stretch/pack
space_image/
space_image.c: registration and common getter/setters
image_draw.c: drawing code, mostly functional
image_panels.c: panels, all commented out
image_render.c: render callbacks, non functional
image_ops.c: operators, only view navigation done
image_header.c: header, menus mostly done but missing buttons
Notes:
* Header menus consist only of Operator and RNA buttons, if they
are not implemented they're displayed grayed out. Ideally the full
header could work like this, but std_libbuttons looks problematic.
* Started using view2d code more than the old code, but for now it
still does own view2d management due to some very specific
requirements that the image window has. The drawing code however
is more clear hopefully, it only uses view2d, and there is no
switching between 'p' and 'f' view2d's anymore, it is always 'f'.
* In order to make uvedit operators more independent I move some
image space settings to scene toolsettings, and the current image
and its buffer is in the context. Especially sync selection and
select mode belonged there anyway as this cannot work correct with
different spaces having different settings anyway.
* Image paint is not back yet, did not want to put that together with
uvedit because there's really no code sharing.. perhaps vertex paint,
image paint and sculpt would be good to have in one module to share
brush code, partial redraw, etc better.
2009-01-15 04:38:18 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
SpaceImage *sima = CTX_wm_space_image(C);
|
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
2010-12-20 05:26:25 +00:00
|
|
|
return ED_space_image_show_uvedit(sima, obedit);
|
2.5: Space Image ported back
Organized as follows:
uvedit/
uv editing related code
uvedit_draw.c: drawing code
uvedit_ops.c: operators, just a few done
uvedit_unwrap_ops.c: will be operators for unwrapping
uvedit_paramatrizer.c: lscm/abf/stretch/pack
space_image/
space_image.c: registration and common getter/setters
image_draw.c: drawing code, mostly functional
image_panels.c: panels, all commented out
image_render.c: render callbacks, non functional
image_ops.c: operators, only view navigation done
image_header.c: header, menus mostly done but missing buttons
Notes:
* Header menus consist only of Operator and RNA buttons, if they
are not implemented they're displayed grayed out. Ideally the full
header could work like this, but std_libbuttons looks problematic.
* Started using view2d code more than the old code, but for now it
still does own view2d management due to some very specific
requirements that the image window has. The drawing code however
is more clear hopefully, it only uses view2d, and there is no
switching between 'p' and 'f' view2d's anymore, it is always 'f'.
* In order to make uvedit operators more independent I move some
image space settings to scene toolsettings, and the current image
and its buffer is in the context. Especially sync selection and
select mode belonged there anyway as this cannot work correct with
different spaces having different settings anyway.
* Image paint is not back yet, did not want to put that together with
uvedit because there's really no code sharing.. perhaps vertex paint,
image paint and sculpt would be good to have in one module to share
brush code, partial redraw, etc better.
2009-01-15 04:38:18 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_uvedit_space_image(bContext *C)
|
2013-04-08 10:03:51 +00:00
|
|
|
{
|
|
|
|
SpaceImage *sima = CTX_wm_space_image(C);
|
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
return sima && ED_space_image_show_uvedit(sima, obedit);
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_uvmap(bContext *C)
|
2009-02-07 01:27:46 +00:00
|
|
|
{
|
2012-03-02 12:09:49 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
BMEditMesh *em = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (obedit && obedit->type == OB_MESH) {
|
2013-04-16 05:59:48 +00:00
|
|
|
em = BKE_editmesh_from_object(obedit);
|
2012-03-02 12:09:49 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (em && (em->bm->totface)) {
|
2014-04-01 11:34:00 +11:00
|
|
|
return true;
|
2011-12-04 23:13:28 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
return false;
|
2009-02-07 01:27:46 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editsurfcurve(bContext *C)
|
2009-01-01 13:15:35 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (obedit && ELEM(obedit->type, OB_CURVE, OB_SURF))
|
2.5: Most curve/surface editmode operators back:
* Hide, Reveal
* Separate, Duplicate, Delete
* Set Weight, Set Radius, Set Spline Type, Set Handle Type, Set Smooth
* Tilt, Clear Tilt
* Smooth, Smooth Radius
* De(select) First, De(select) Last, De(select) All, Select Inverse,
Select Linked, Select Control Point Row, Select Next, Select Previous,
Select More, Select Less, Select Random, Select Every Nth
* Switch Direction, Subdivide, Make Segment, Spin, Extrude, Toggle Cyclic
* Specials Menu
Not working correct yet:
* Add Vertex (ctrl click)
* Add Menu
2009-02-12 22:12:21 +00:00
|
|
|
return NULL != ((Curve *)obedit->data)->editnurb;
|
2009-01-01 13:15:35 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-12-26 19:07:31 +00:00
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editsurfcurve_region_view3d(bContext *C)
|
2010-11-21 18:50:53 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ED_operator_editsurfcurve(C) && CTX_wm_region_view3d(C))
|
2010-11-21 18:50:53 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
CTX_wm_operator_poll_msg_set(C, "expected a view3d region & editcurve");
|
|
|
|
return 0;
|
|
|
|
}
|
2008-12-26 19:07:31 +00:00
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editcurve(bContext *C)
|
2.5: Most curve/surface editmode operators back:
* Hide, Reveal
* Separate, Duplicate, Delete
* Set Weight, Set Radius, Set Spline Type, Set Handle Type, Set Smooth
* Tilt, Clear Tilt
* Smooth, Smooth Radius
* De(select) First, De(select) Last, De(select) All, Select Inverse,
Select Linked, Select Control Point Row, Select Next, Select Previous,
Select More, Select Less, Select Random, Select Every Nth
* Switch Direction, Subdivide, Make Segment, Spin, Extrude, Toggle Cyclic
* Specials Menu
Not working correct yet:
* Add Vertex (ctrl click)
* Add Menu
2009-02-12 22:12:21 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_CURVE)
|
2.5: Most curve/surface editmode operators back:
* Hide, Reveal
* Separate, Duplicate, Delete
* Set Weight, Set Radius, Set Spline Type, Set Handle Type, Set Smooth
* Tilt, Clear Tilt
* Smooth, Smooth Radius
* De(select) First, De(select) Last, De(select) All, Select Inverse,
Select Linked, Select Control Point Row, Select Next, Select Previous,
Select More, Select Less, Select Random, Select Every Nth
* Switch Direction, Subdivide, Make Segment, Spin, Extrude, Toggle Cyclic
* Specials Menu
Not working correct yet:
* Add Vertex (ctrl click)
* Add Menu
2009-02-12 22:12:21 +00:00
|
|
|
return NULL != ((Curve *)obedit->data)->editnurb;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editcurve_3d(bContext *C)
|
2011-11-01 11:00:08 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_CURVE) {
|
|
|
|
Curve *cu = (Curve *)obedit->data;
|
2011-11-01 11:00:08 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
return (cu->flag & CU_3D) && (NULL != cu->editnurb);
|
2011-11-01 11:00:08 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editsurf(bContext *C)
|
2.5: Most curve/surface editmode operators back:
* Hide, Reveal
* Separate, Duplicate, Delete
* Set Weight, Set Radius, Set Spline Type, Set Handle Type, Set Smooth
* Tilt, Clear Tilt
* Smooth, Smooth Radius
* De(select) First, De(select) Last, De(select) All, Select Inverse,
Select Linked, Select Control Point Row, Select Next, Select Previous,
Select More, Select Less, Select Random, Select Every Nth
* Switch Direction, Subdivide, Make Segment, Spin, Extrude, Toggle Cyclic
* Specials Menu
Not working correct yet:
* Add Vertex (ctrl click)
* Add Menu
2009-02-12 22:12:21 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_SURF)
|
2.5: Most curve/surface editmode operators back:
* Hide, Reveal
* Separate, Duplicate, Delete
* Set Weight, Set Radius, Set Spline Type, Set Handle Type, Set Smooth
* Tilt, Clear Tilt
* Smooth, Smooth Radius
* De(select) First, De(select) Last, De(select) All, Select Inverse,
Select Linked, Select Control Point Row, Select Next, Select Previous,
Select More, Select Less, Select Random, Select Every Nth
* Switch Direction, Subdivide, Make Segment, Spin, Extrude, Toggle Cyclic
* Specials Menu
Not working correct yet:
* Add Vertex (ctrl click)
* Add Menu
2009-02-12 22:12:21 +00:00
|
|
|
return NULL != ((Curve *)obedit->data)->editnurb;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editfont(bContext *C)
|
2.5: Text edit mode operators back. Took me a while getting
them nicely repeatable, and splitting up the big edit_text
operator into individual operator so it's all nicely scriptable,
documented, configurable, etc..
* Insert Text, Line Break, Insert Lorem
* Toggle Case, Set Case, Toggle Style, Set Style, Set Material
* Copy Text, Cut Text, Paste Text, Paste File, Paste Buffer
* Move, Move Select, Delete
* Change Spacing, Change Character
Notes
* Text (datablock) to Object doesn't work yet, will need to
implement text editor context for that.
* Some shortcut keys don't work because screen/wm overrides them,
ctrl+x, ctrl+left/right. That override goes top down which works
well for some cases, but here we need to override in the other
direction.
* There's no unicode support in RNA, or the user interface code
for that matter, but text strings can contain these characters.
At the moment it stores a UTF-8 string in char arrays, which is
supposed to be nicely compatible with ascii. Seems reasonable to
add support for UTF-8 in the interface code, python bindings, ..
eventually?
2009-02-17 19:55:20 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_FONT)
|
2.5: Text edit mode operators back. Took me a while getting
them nicely repeatable, and splitting up the big edit_text
operator into individual operator so it's all nicely scriptable,
documented, configurable, etc..
* Insert Text, Line Break, Insert Lorem
* Toggle Case, Set Case, Toggle Style, Set Style, Set Material
* Copy Text, Cut Text, Paste Text, Paste File, Paste Buffer
* Move, Move Select, Delete
* Change Spacing, Change Character
Notes
* Text (datablock) to Object doesn't work yet, will need to
implement text editor context for that.
* Some shortcut keys don't work because screen/wm overrides them,
ctrl+x, ctrl+left/right. That override goes top down which works
well for some cases, but here we need to override in the other
direction.
* There's no unicode support in RNA, or the user interface code
for that matter, but text strings can contain these characters.
At the moment it stores a UTF-8 string in char arrays, which is
supposed to be nicely compatible with ascii. Seems reasonable to
add support for UTF-8 in the interface code, python bindings, ..
eventually?
2009-02-17 19:55:20 +00:00
|
|
|
return NULL != ((Curve *)obedit->data)->editfont;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editlattice(bContext *C)
|
2009-07-03 15:23:33 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_LATTICE)
|
2009-07-03 15:23:33 +00:00
|
|
|
return NULL != ((Lattice *)obedit->data)->editlatt;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_editmball(bContext *C)
|
2009-07-29 12:35:09 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
|
|
|
if (obedit && obedit->type == OB_MBALL)
|
2009-07-29 12:35:09 +00:00
|
|
|
return NULL != ((MetaBall *)obedit->data)->editelems;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool ED_operator_mask(bContext *C)
|
2012-06-04 16:42:58 +00:00
|
|
|
{
|
2012-07-25 12:15:22 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
if (sa && sa->spacedata.first) {
|
|
|
|
switch (sa->spacetype) {
|
|
|
|
case SPACE_CLIP:
|
|
|
|
{
|
|
|
|
SpaceClip *sc = sa->spacedata.first;
|
|
|
|
return ED_space_clip_check_show_maskedit(sc);
|
|
|
|
}
|
|
|
|
case SPACE_SEQ:
|
|
|
|
{
|
|
|
|
SpaceSeq *sseq = sa->spacedata.first;
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
return ED_space_sequencer_check_show_maskedit(sseq, scene);
|
|
|
|
}
|
|
|
|
case SPACE_IMAGE:
|
|
|
|
{
|
|
|
|
SpaceImage *sima = sa->spacedata.first;
|
2017-11-23 13:51:49 -02:00
|
|
|
ViewLayer *view_layer = CTX_data_view_layer(C);
|
2018-04-05 18:20:27 +02:00
|
|
|
return ED_space_image_check_show_maskedit(sima, view_layer);
|
2012-07-25 12:15:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-06-04 16:42:58 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
return false;
|
2012-06-04 16:42:58 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 12:03:56 +02:00
|
|
|
bool ED_operator_camera(bContext *C)
|
2017-10-26 21:40:37 +11:00
|
|
|
{
|
|
|
|
struct Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
|
|
|
|
return (cam != NULL);
|
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Internal Screen Utilities
|
|
|
|
* \{ */
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool screen_active_editable(bContext *C)
|
2018-01-21 01:41:58 +11:00
|
|
|
{
|
|
|
|
if (ED_operator_screenactive(C)) {
|
|
|
|
/* no full window splitting allowed */
|
|
|
|
if (CTX_wm_screen(C)->state != SCREENNORMAL)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ARegion *screen_find_region_type(bContext *C, int type)
|
|
|
|
{
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
|
|
|
|
|
|
|
/* find the header region
|
|
|
|
* - try context first, but upon failing, search all regions in area...
|
|
|
|
*/
|
|
|
|
if ((ar == NULL) || (ar->regiontype != type)) {
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
ar = BKE_area_find_region_type(sa, type);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ar = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ar;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Action Zone Operator
|
|
|
|
* \{ */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-06-04 09:31:30 +02:00
|
|
|
/* operator state vars used:
|
2012-03-03 16:31:46 +00:00
|
|
|
* none
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* functions:
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* apply() set actionzone event
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* exit() free customdata
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* callbacks:
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* exec() never used
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
|
|
|
* invoke() check if in zone
|
2012-03-03 16:31:46 +00:00
|
|
|
* add customdata, put mouseco and area in it
|
|
|
|
* add modal handler
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* modal() accept modal events while doing it
|
|
|
|
* call apply() with gesture info, active window, nonactive window
|
|
|
|
* call exit() and remove handler when LMB confirm
|
2009-12-10 09:25:30 +00:00
|
|
|
*/
|
2008-11-19 16:28:11 +00:00
|
|
|
|
|
|
|
typedef struct sActionzoneData {
|
|
|
|
ScrArea *sa1, *sa2;
|
|
|
|
AZone *az;
|
2009-03-05 23:19:44 +00:00
|
|
|
int x, y, gesture_dir, modifier;
|
2008-11-19 16:28:11 +00:00
|
|
|
} sActionzoneData;
|
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
/* quick poll to save operators to be created and handled */
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool actionzone_area_poll(bContext *C)
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2019-02-21 17:04:20 +01:00
|
|
|
bScreen *screen = WM_window_get_active_screen(win);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-02-21 17:04:20 +01:00
|
|
|
if (screen && win && win->eventstate) {
|
2013-06-28 05:39:05 +00:00
|
|
|
const int *xy = &win->eventstate->x;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
AZone *az;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-02-21 17:04:20 +01:00
|
|
|
for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
|
|
|
|
for (az = sa->actionzones.first; az; az = az->next)
|
|
|
|
if (BLI_rcti_isect_pt_v(&az->rect, xy))
|
|
|
|
return 1;
|
|
|
|
}
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2014-10-14 15:05:44 -03:00
|
|
|
/* the debug drawing of the click_rect is in area_draw_azone_fullscreen, keep both in sync */
|
|
|
|
static void fullscreen_click_rcti_init(rcti *rect, const short x1, const short y1, const short x2, const short y2)
|
|
|
|
{
|
|
|
|
int x = x2 - ((float) x2 - x1) * 0.5f / UI_DPI_FAC;
|
|
|
|
int y = y2 - ((float) y2 - y1) * 0.5f / UI_DPI_FAC;
|
|
|
|
float icon_size = UI_DPI_ICON_SIZE + 7 * UI_DPI_FAC;
|
|
|
|
|
|
|
|
/* adjust the icon distance from the corner */
|
|
|
|
x += 36.0f / UI_DPI_FAC;
|
|
|
|
y += 36.0f / UI_DPI_FAC;
|
|
|
|
|
|
|
|
/* draws from the left bottom corner of the icon */
|
|
|
|
x -= UI_DPI_ICON_SIZE;
|
|
|
|
y -= UI_DPI_ICON_SIZE;
|
|
|
|
|
|
|
|
BLI_rcti_init(rect, x, x + icon_size, y, y + icon_size);
|
|
|
|
}
|
|
|
|
|
2018-06-20 15:32:46 +02:00
|
|
|
static AZone *area_actionzone_refresh_xy(ScrArea *sa, const int xy[2], const bool test_only)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
AZone *az = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
for (az = sa->actionzones.first; az; az = az->next) {
|
2012-08-23 18:25:45 +00:00
|
|
|
if (BLI_rcti_isect_pt_v(&az->rect, xy)) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (az->type == AZONE_AREA) {
|
2019-01-04 15:09:11 +01:00
|
|
|
break;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (az->type == AZONE_REGION) {
|
2009-09-16 17:43:09 +00:00
|
|
|
break;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
2014-10-14 15:05:44 -03:00
|
|
|
else if (az->type == AZONE_FULLSCREEN) {
|
|
|
|
rcti click_rect;
|
|
|
|
fullscreen_click_rcti_init(&click_rect, az->x1, az->y1, az->x2, az->y2);
|
2018-06-20 15:32:46 +02:00
|
|
|
const bool click_isect = BLI_rcti_isect_pt_v(&click_rect, xy);
|
2014-10-14 15:05:44 -03:00
|
|
|
|
2018-06-20 15:32:46 +02:00
|
|
|
if (test_only) {
|
|
|
|
if (click_isect) {
|
|
|
|
break;
|
|
|
|
}
|
2014-10-14 15:05:44 -03:00
|
|
|
}
|
|
|
|
else {
|
2018-06-20 15:32:46 +02:00
|
|
|
if (click_isect) {
|
2014-10-14 15:05:44 -03:00
|
|
|
az->alpha = 1.0f;
|
|
|
|
}
|
|
|
|
else {
|
2018-06-20 15:58:46 +02:00
|
|
|
const int mouse_sq = SQUARE(xy[0] - az->x2) + SQUARE(xy[1] - az->y2);
|
2019-01-23 14:44:40 +01:00
|
|
|
const int spot_sq = SQUARE(AZONESPOTW);
|
2018-06-20 15:58:46 +02:00
|
|
|
const int fadein_sq = SQUARE(AZONEFADEIN);
|
|
|
|
const int fadeout_sq = SQUARE(AZONEFADEOUT);
|
2018-06-20 15:32:46 +02:00
|
|
|
|
2018-06-20 15:58:46 +02:00
|
|
|
if (mouse_sq < spot_sq) {
|
2018-06-20 15:32:46 +02:00
|
|
|
az->alpha = 1.0f;
|
|
|
|
}
|
2018-06-20 15:58:46 +02:00
|
|
|
else if (mouse_sq < fadein_sq) {
|
2018-06-20 15:32:46 +02:00
|
|
|
az->alpha = 1.0f;
|
|
|
|
}
|
2018-06-20 15:58:46 +02:00
|
|
|
else if (mouse_sq < fadeout_sq) {
|
|
|
|
az->alpha = 1.0f - ((float)(mouse_sq - fadein_sq)) / ((float)(fadeout_sq - fadein_sq));
|
2018-06-20 15:32:46 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
az->alpha = 0.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fade in/out but no click */
|
|
|
|
az = NULL;
|
2014-10-14 15:05:44 -03:00
|
|
|
}
|
|
|
|
|
2018-06-20 15:32:46 +02:00
|
|
|
/* XXX force redraw to show/hide the action zone */
|
|
|
|
ED_area_tag_redraw(sa);
|
|
|
|
break;
|
2014-10-14 15:05:44 -03:00
|
|
|
}
|
|
|
|
}
|
2018-05-07 01:31:18 +02:00
|
|
|
else if (az->type == AZONE_REGION_SCROLL) {
|
|
|
|
ARegion *ar = az->ar;
|
|
|
|
View2D *v2d = &ar->v2d;
|
2018-11-07 18:14:21 +11:00
|
|
|
int scroll_flag = 0;
|
|
|
|
const int isect_value = UI_view2d_mouse_in_scrollers_ex(ar, v2d, xy[0], xy[1], &scroll_flag);
|
|
|
|
|
|
|
|
/* Check if we even have scroll bars. */
|
|
|
|
if (((az->direction == AZ_SCROLL_HOR) && !(scroll_flag & V2D_SCROLL_HORIZONTAL)) ||
|
|
|
|
((az->direction == AZ_SCROLL_VERT) && !(scroll_flag & V2D_SCROLL_VERTICAL)))
|
|
|
|
{
|
|
|
|
/* no scrollbars, do nothing. */
|
|
|
|
}
|
|
|
|
else if (test_only) {
|
2018-06-20 15:50:54 +02:00
|
|
|
if (isect_value != 0) {
|
|
|
|
break;
|
2018-05-07 01:31:18 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2018-06-20 15:50:54 +02:00
|
|
|
bool redraw = false;
|
|
|
|
|
|
|
|
if (isect_value == 'h') {
|
|
|
|
if (az->direction == AZ_SCROLL_HOR) {
|
|
|
|
az->alpha = 1.0f;
|
|
|
|
v2d->alpha_hor = 255;
|
|
|
|
redraw = true;
|
|
|
|
}
|
2018-05-07 01:31:18 +02:00
|
|
|
}
|
2018-06-20 15:50:54 +02:00
|
|
|
else if (isect_value == 'v') {
|
|
|
|
if (az->direction == AZ_SCROLL_VERT) {
|
|
|
|
az->alpha = 1.0f;
|
|
|
|
v2d->alpha_vert = 255;
|
|
|
|
redraw = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const int local_xy[2] = {xy[0] - ar->winrct.xmin, xy[1] - ar->winrct.ymin};
|
|
|
|
float dist_fac = 0.0f, alpha = 0.0f;
|
|
|
|
|
|
|
|
if (az->direction == AZ_SCROLL_HOR) {
|
|
|
|
dist_fac = BLI_rcti_length_y(&v2d->hor, local_xy[1]) / AZONEFADEIN;
|
|
|
|
CLAMP(dist_fac, 0.0f, 1.0f);
|
|
|
|
alpha = 1.0f - dist_fac;
|
|
|
|
|
|
|
|
v2d->alpha_hor = alpha * 255;
|
|
|
|
}
|
|
|
|
else if (az->direction == AZ_SCROLL_VERT) {
|
|
|
|
dist_fac = BLI_rcti_length_x(&v2d->vert, local_xy[0]) / AZONEFADEIN;
|
|
|
|
CLAMP(dist_fac, 0.0f, 1.0f);
|
|
|
|
alpha = 1.0f - dist_fac;
|
|
|
|
|
|
|
|
v2d->alpha_vert = alpha * 255;
|
|
|
|
}
|
|
|
|
az->alpha = alpha;
|
|
|
|
redraw = true;
|
2018-05-07 01:31:18 +02:00
|
|
|
}
|
|
|
|
|
2018-06-20 15:50:54 +02:00
|
|
|
if (redraw) {
|
|
|
|
ED_area_tag_redraw_no_rebuild(sa);
|
|
|
|
}
|
|
|
|
/* Don't return! */
|
2018-05-07 01:31:18 +02:00
|
|
|
}
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2019-01-04 21:40:16 +01:00
|
|
|
else if (!test_only && !IS_EQF(az->alpha, 0.0f)) {
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
if (az->type == AZONE_FULLSCREEN) {
|
|
|
|
az->alpha = 0.0f;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
else if (az->type == AZONE_REGION_SCROLL) {
|
|
|
|
if (az->direction == AZ_SCROLL_VERT) {
|
|
|
|
az->alpha = az->ar->v2d.alpha_vert = 0;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
else if (az->direction == AZ_SCROLL_HOR) {
|
|
|
|
az->alpha = az->ar->v2d.alpha_hor = 0;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_assert(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (changed) {
|
|
|
|
sa->flag &= ~AREA_FLAG_ACTIONZONES_UPDATE;
|
|
|
|
ED_area_tag_redraw_no_rebuild(sa);
|
|
|
|
}
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return az;
|
|
|
|
}
|
|
|
|
|
2019-02-21 17:04:20 +01:00
|
|
|
/* Finds an actionzone by position in entire screen so azones can overlap */
|
|
|
|
static AZone *screen_actionzone_find_xy(bScreen *sc, const int xy[2])
|
|
|
|
{
|
|
|
|
for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
|
|
|
|
AZone *az = area_actionzone_refresh_xy(sa, xy, true);
|
|
|
|
if (az != NULL) {
|
|
|
|
return az;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the area that the azone belongs to */
|
|
|
|
static ScrArea *screen_actionzone_area(bScreen *sc, const AZone *az)
|
|
|
|
{
|
|
|
|
for (ScrArea *area = sc->areabase.first; area; area = area->next) {
|
|
|
|
for (AZone *zone = area->actionzones.first; zone; zone = zone->next) {
|
|
|
|
if (zone == az) {
|
|
|
|
return area;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-06-20 15:32:46 +02:00
|
|
|
AZone *ED_area_actionzone_find_xy(ScrArea *sa, const int xy[2])
|
|
|
|
{
|
|
|
|
return area_actionzone_refresh_xy(sa, xy, true);
|
|
|
|
}
|
|
|
|
|
2019-01-04 21:40:16 +01:00
|
|
|
AZone *ED_area_azones_update(ScrArea *sa, const int xy[2])
|
2018-06-20 15:32:46 +02:00
|
|
|
{
|
|
|
|
return area_actionzone_refresh_xy(sa, xy, false);
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2010-10-14 12:24:08 +00:00
|
|
|
static void actionzone_exit(wmOperator *op)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (op->customdata)
|
2008-11-19 16:28:11 +00:00
|
|
|
MEM_freeN(op->customdata);
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = NULL;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* send EVT_ACTIONZONE event */
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
static void actionzone_apply(bContext *C, wmOperator *op, int type)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
|
|
|
wmEvent event;
|
2012-05-08 11:48:19 +00:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
|
|
|
sActionzoneData *sad = op->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->modifier = RNA_int_get(op->ptr, "modifier");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-07-29 08:29:04 +00:00
|
|
|
wm_event_init_from_window(win, &event);
|
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (type == AZONE_AREA)
|
|
|
|
event.type = EVT_ACTIONZONE_AREA;
|
2014-10-14 15:05:44 -03:00
|
|
|
else if (type == AZONE_FULLSCREEN)
|
|
|
|
event.type = EVT_ACTIONZONE_FULLSCREEN;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
else
|
2012-05-08 11:48:19 +00:00
|
|
|
event.type = EVT_ACTIONZONE_REGION;
|
2014-10-14 15:05:44 -03:00
|
|
|
|
2015-04-05 06:22:49 +10:00
|
|
|
event.val = KM_NOTHING;
|
2012-05-08 11:48:19 +00:00
|
|
|
event.customdata = op->customdata;
|
2014-04-01 11:34:00 +11:00
|
|
|
event.customdatafree = true;
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-18 02:56:48 +00:00
|
|
|
wm_event_add(win, &event);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
{
|
2019-02-21 17:04:20 +01:00
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
|
|
|
AZone *az = screen_actionzone_find_xy(sc, &event->x);
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
sActionzoneData *sad;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-29 20:54:44 +02:00
|
|
|
/* quick escape - Scroll azones only hide/unhide the scroll-bars, they have their own handling. */
|
|
|
|
if (az == NULL || ELEM(az->type, AZONE_REGION_SCROLL))
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
/* ok we do the actionzone */
|
2012-05-08 11:48:19 +00:00
|
|
|
sad = op->customdata = MEM_callocN(sizeof(sActionzoneData), "sActionzoneData");
|
2019-02-21 17:04:20 +01:00
|
|
|
sad->sa1 = screen_actionzone_area(sc, az);
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->az = az;
|
|
|
|
sad->x = event->x; sad->y = event->y;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
/* region azone directly reacts on mouse clicks */
|
2014-10-14 15:05:44 -03:00
|
|
|
if (ELEM(sad->az->type, AZONE_REGION, AZONE_FULLSCREEN)) {
|
|
|
|
actionzone_apply(C, op, sad->az->type);
|
2010-10-14 12:24:08 +00:00
|
|
|
actionzone_exit(op);
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* add modal handler */
|
2009-10-22 23:22:05 +00:00
|
|
|
WM_event_add_modal_handler(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2013-11-25 13:40:58 +01:00
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
sActionzoneData *sad = op->customdata;
|
2013-11-25 13:40:58 +01:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (event->type) {
|
2008-11-19 16:28:11 +00:00
|
|
|
case MOUSEMOVE:
|
2013-09-04 05:06:38 +00:00
|
|
|
{
|
2013-09-04 05:25:29 +00:00
|
|
|
bool is_gesture;
|
2013-09-04 05:06:38 +00:00
|
|
|
|
|
|
|
const int delta_x = (event->x - sad->x);
|
|
|
|
const int delta_y = (event->y - sad->y);
|
|
|
|
|
2019-01-23 14:44:40 +01:00
|
|
|
/* Movement in dominant direction. */
|
|
|
|
const int delta_max = max_ii(ABS(delta_x), ABS(delta_y));
|
2019-02-21 17:22:51 +01:00
|
|
|
|
|
|
|
/* Movement in dominant direction before action taken. */
|
|
|
|
const int join_threshold = (0.6 * U.widget_unit);
|
|
|
|
const int split_threshold = (1.2 * U.widget_unit);
|
|
|
|
const int area_threshold = (0.1 * U.widget_unit);
|
2019-01-23 14:44:40 +01:00
|
|
|
|
|
|
|
/* Calculate gesture cardinal direction. */
|
2013-09-04 05:06:38 +00:00
|
|
|
if (delta_y > ABS(delta_x))
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->gesture_dir = 'n';
|
2019-01-23 14:44:40 +01:00
|
|
|
else if (delta_x >= ABS(delta_y))
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->gesture_dir = 'e';
|
2013-09-04 05:06:38 +00:00
|
|
|
else if (delta_y < -ABS(delta_x))
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->gesture_dir = 's';
|
2008-11-19 16:28:11 +00:00
|
|
|
else
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->gesture_dir = 'w';
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-09-04 05:25:29 +00:00
|
|
|
if (sad->az->type == AZONE_AREA) {
|
2019-02-21 17:22:51 +01:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2018-05-23 22:38:25 +02:00
|
|
|
rcti screen_rect;
|
|
|
|
|
|
|
|
WM_window_screen_rect_calc(win, &screen_rect);
|
2019-02-21 17:22:51 +01:00
|
|
|
|
|
|
|
/* Have we dragged off the zone and are not on an edge? */
|
|
|
|
if ((ED_area_actionzone_find_xy(sad->sa1, &event->x) != sad->az) &&
|
2019-02-26 14:31:14 +11:00
|
|
|
(screen_geom_area_map_find_active_scredge(
|
|
|
|
AREAMAP_FROM_SCREEN(sc), &screen_rect, event->x, event->y) == NULL))
|
|
|
|
{
|
2019-02-21 17:22:51 +01:00
|
|
|
/* Are we still in same area? */
|
|
|
|
if (BKE_screen_find_area_xy(sc, SPACE_TYPE_ANY, event->x, event->y) == sad->sa1) {
|
|
|
|
/* Same area, so possible split. */
|
|
|
|
WM_cursor_set(win, (ELEM(sad->gesture_dir, 'n', 's')) ? BC_V_SPLITCURSOR : BC_H_SPLITCURSOR);
|
|
|
|
is_gesture = (delta_max > split_threshold);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Different area, so posible join. */
|
|
|
|
if (sad->gesture_dir == 'n')
|
|
|
|
WM_cursor_set(win, BC_N_ARROWCURSOR);
|
|
|
|
else if (sad->gesture_dir == 's')
|
|
|
|
WM_cursor_set(win, BC_S_ARROWCURSOR);
|
|
|
|
else if (sad->gesture_dir == 'e')
|
|
|
|
WM_cursor_set(win, BC_E_ARROWCURSOR);
|
|
|
|
else
|
|
|
|
WM_cursor_set(win, BC_W_ARROWCURSOR);
|
|
|
|
is_gesture = (delta_max > join_threshold);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
WM_cursor_set(CTX_wm_window(C), BC_CROSSCURSOR);
|
|
|
|
is_gesture = false;
|
|
|
|
}
|
2013-09-04 05:25:29 +00:00
|
|
|
}
|
|
|
|
else {
|
2019-02-21 17:22:51 +01:00
|
|
|
is_gesture = (delta_max > area_threshold);
|
2013-09-04 05:25:29 +00:00
|
|
|
}
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* gesture is large enough? */
|
2013-09-04 05:25:29 +00:00
|
|
|
if (is_gesture) {
|
|
|
|
/* second area, for join when (sa1 != sa2) */
|
2015-01-21 13:43:46 +11:00
|
|
|
sad->sa2 = BKE_screen_find_area_xy(sc, SPACE_TYPE_ANY, event->x, event->y);
|
2008-11-19 16:28:11 +00:00
|
|
|
/* apply sends event */
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
actionzone_apply(C, op, sad->az->type);
|
2010-10-14 12:24:08 +00:00
|
|
|
actionzone_exit(op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
2009-12-10 09:25:30 +00:00
|
|
|
break;
|
2013-09-04 05:06:38 +00:00
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
case ESCKEY:
|
2010-10-14 12:24:08 +00:00
|
|
|
actionzone_exit(op);
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2012-10-21 05:46:41 +00:00
|
|
|
case LEFTMOUSE:
|
2010-10-14 12:24:08 +00:00
|
|
|
actionzone_exit(op);
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void actionzone_cancel(bContext *UNUSED(C), wmOperator *op)
|
2011-06-06 11:04:54 +00:00
|
|
|
{
|
|
|
|
actionzone_exit(op);
|
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_actionzone(wmOperatorType *ot)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2013-01-27 07:23:58 +00:00
|
|
|
ot->name = "Handle Area Action Zones";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Handle area action zones for mouse actions/gestures";
|
|
|
|
ot->idname = "SCREEN_OT_actionzone";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = actionzone_invoke;
|
|
|
|
ot->modal = actionzone_modal;
|
|
|
|
ot->poll = actionzone_area_poll;
|
|
|
|
ot->cancel = actionzone_cancel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-02-26 13:48:41 +11:00
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-10-20 07:56:04 +00:00
|
|
|
RNA_def_int(ot->srna, "modifier", 0, 0, 2, "Modifier", "Modifier state", 0, 2);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Swap Area Operator
|
|
|
|
* \{ */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-03-23 11:51:19 +01:00
|
|
|
/* operator state vars used:
|
|
|
|
* sa1 start area
|
|
|
|
* sa2 area to swap with
|
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* functions:
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* init() set custom data for operator, based on actionzone event custom data
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
|
|
|
* cancel() cancel the operator
|
|
|
|
*
|
|
|
|
* exit() cleanup, send notifier
|
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* callbacks:
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* invoke() gets called on shift+lmb drag in actionzone
|
|
|
|
* call init(), add handler
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* modal() accept modal events while doing it
|
2009-12-10 09:25:30 +00:00
|
|
|
*/
|
2009-03-11 20:22:06 +00:00
|
|
|
|
|
|
|
typedef struct sAreaSwapData {
|
|
|
|
ScrArea *sa1, *sa2;
|
|
|
|
} sAreaSwapData;
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_swap_init(wmOperator *op, const wmEvent *event)
|
2009-03-11 20:22:06 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
sAreaSwapData *sd = NULL;
|
|
|
|
sActionzoneData *sad = event->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sad == NULL || sad->sa1 == NULL)
|
2009-12-10 09:25:30 +00:00
|
|
|
return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
sd = MEM_callocN(sizeof(sAreaSwapData), "sAreaSwapData");
|
|
|
|
sd->sa1 = sad->sa1;
|
|
|
|
sd->sa2 = sad->sa2;
|
|
|
|
op->customdata = sd;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void area_swap_exit(bContext *C, wmOperator *op)
|
|
|
|
{
|
2013-09-06 22:34:29 +00:00
|
|
|
WM_cursor_modal_restore(CTX_wm_window(C));
|
2012-03-24 06:38:07 +00:00
|
|
|
if (op->customdata)
|
2009-03-11 20:22:06 +00:00
|
|
|
MEM_freeN(op->customdata);
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = NULL;
|
2009-03-11 20:22:06 +00:00
|
|
|
}
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void area_swap_cancel(bContext *C, wmOperator *op)
|
2009-03-11 20:22:06 +00:00
|
|
|
{
|
|
|
|
area_swap_exit(C, op);
|
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_swap_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-03-11 20:22:06 +00:00
|
|
|
{
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!area_swap_init(op, event))
|
2009-03-11 20:22:06 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
/* add modal handler */
|
2013-09-06 22:34:29 +00:00
|
|
|
WM_cursor_modal_set(CTX_wm_window(C), BC_SWAPAREA_CURSOR);
|
2009-10-22 23:22:05 +00:00
|
|
|
WM_event_add_modal_handler(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_swap_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-03-11 20:22:06 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
sActionzoneData *sad = op->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (event->type) {
|
2009-03-11 20:22:06 +00:00
|
|
|
case MOUSEMOVE:
|
|
|
|
/* second area, for join */
|
2015-01-21 13:43:46 +11:00
|
|
|
sad->sa2 = BKE_screen_find_area_xy(CTX_wm_screen(C), SPACE_TYPE_ANY, event->x, event->y);
|
2009-03-11 20:22:06 +00:00
|
|
|
break;
|
|
|
|
case LEFTMOUSE: /* release LMB */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->val == KM_RELEASE) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!sad->sa2 || sad->sa1 == sad->sa2) {
|
2013-10-30 23:08:53 +00:00
|
|
|
area_swap_cancel(C, op);
|
|
|
|
return OPERATOR_CANCELLED;
|
2009-03-11 20:22:06 +00:00
|
|
|
}
|
2010-04-06 09:36:35 +00:00
|
|
|
|
2010-01-16 22:56:52 +00:00
|
|
|
ED_area_tag_redraw(sad->sa1);
|
|
|
|
ED_area_tag_redraw(sad->sa2);
|
|
|
|
|
2010-04-06 09:36:35 +00:00
|
|
|
ED_area_swapspace(C, sad->sa1, sad->sa2);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-04-06 09:36:35 +00:00
|
|
|
area_swap_exit(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
break;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
case ESCKEY:
|
2013-10-30 23:08:53 +00:00
|
|
|
area_swap_cancel(C, op);
|
|
|
|
return OPERATOR_CANCELLED;
|
2009-03-11 20:22:06 +00:00
|
|
|
}
|
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
static void SCREEN_OT_area_swap(wmOperatorType *ot)
|
2009-03-11 20:22:06 +00:00
|
|
|
{
|
2013-01-27 07:23:58 +00:00
|
|
|
ot->name = "Swap Areas";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Swap selected areas screen positions";
|
|
|
|
ot->idname = "SCREEN_OT_area_swap";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = area_swap_invoke;
|
|
|
|
ot->modal = area_swap_modal;
|
|
|
|
ot->poll = ED_operator_areaactive;
|
|
|
|
ot->cancel = area_swap_cancel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_BLOCKING;
|
2009-03-11 20:22:06 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Area Duplicate Operator
|
|
|
|
*
|
|
|
|
* Create new window from area.
|
|
|
|
* \{ */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
|
|
|
/* operator callback */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_dupli_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2018-06-06 16:32:09 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
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
|
|
|
wmWindow *newwin, *win = CTX_wm_window(C);
|
|
|
|
Scene *scene;
|
|
|
|
WorkSpace *workspace = WM_window_get_active_workspace(win);
|
|
|
|
WorkSpaceLayout *layout_old = WM_window_get_active_layout(win);
|
|
|
|
WorkSpaceLayout *layout_new;
|
|
|
|
bScreen *newsc;
|
2008-12-18 02:56:48 +00:00
|
|
|
ScrArea *sa;
|
2008-11-19 16:28:11 +00:00
|
|
|
rcti rect;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
win = CTX_wm_window(C);
|
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
|
|
|
scene = CTX_data_scene(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
sa = CTX_wm_area(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-06-04 14:32:10 +00:00
|
|
|
/* XXX hrmf! */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->type == EVT_ACTIONZONE_AREA) {
|
|
|
|
sActionzoneData *sad = event->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sad == NULL)
|
2009-06-04 14:32:10 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
sa = sad->sa1;
|
2009-06-04 14:32:10 +00:00
|
|
|
}
|
2013-11-19 02:52:34 +11:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* adds window to WM */
|
2012-05-08 11:48:19 +00:00
|
|
|
rect = sa->totrct;
|
2012-07-15 00:29:56 +00:00
|
|
|
BLI_rcti_translate(&rect, win->posx, win->posy);
|
2013-04-19 00:37:30 +00:00
|
|
|
rect.xmax = rect.xmin + BLI_rcti_size_x(&rect) / U.pixelsize;
|
|
|
|
rect.ymax = rect.ymin + BLI_rcti_size_y(&rect) / U.pixelsize;
|
2013-04-18 16:28:36 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
newwin = WM_window_open(C, &rect);
|
2015-10-07 00:27:27 +11:00
|
|
|
if (newwin == NULL) {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Failed to open window!");
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
|
2015-04-06 10:40:12 -03:00
|
|
|
*newwin->stereo3d_format = *win->stereo3d_format;
|
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
|
|
|
|
|
|
|
newwin->scene = scene;
|
|
|
|
|
2018-07-03 15:34:26 +02:00
|
|
|
BKE_workspace_active_set(newwin->workspace_hook, workspace);
|
2008-11-19 16:28:11 +00:00
|
|
|
/* allocs new screen and adds to newly created window, using window size */
|
2018-06-06 16:32:09 +02:00
|
|
|
layout_new = ED_workspace_layout_add(bmain, workspace, newwin, BKE_workspace_layout_name_get(layout_old));
|
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
|
|
|
newsc = BKE_workspace_layout_screen_get(layout_new);
|
|
|
|
WM_window_set_active_layout(newwin, workspace, layout_new);
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* copy area to new screen */
|
2014-04-11 17:16:51 +10:00
|
|
|
ED_area_data_copy((ScrArea *)newsc->areabase.first, sa, true);
|
2010-07-25 01:39:47 +00:00
|
|
|
|
2010-01-16 22:56:52 +00:00
|
|
|
ED_area_tag_redraw((ScrArea *)newsc->areabase.first);
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* screen, areas init */
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2015-10-07 00:27:27 +11:00
|
|
|
|
|
|
|
|
|
|
|
finally:
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->type == EVT_ACTIONZONE_AREA)
|
2010-10-14 12:24:08 +00:00
|
|
|
actionzone_exit(op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2015-10-07 00:27:27 +11:00
|
|
|
if (newwin) {
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
static void SCREEN_OT_area_dupli(wmOperatorType *ot)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Duplicate Area into New Window";
|
|
|
|
ot->description = "Duplicate selected area into new window";
|
|
|
|
ot->idname = "SCREEN_OT_area_dupli";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = area_dupli_invoke;
|
|
|
|
ot->poll = ED_operator_areaactive;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Move Area Edge Operator
|
|
|
|
* \{ */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-06-04 09:31:30 +02:00
|
|
|
/* operator state vars used:
|
2012-05-08 11:48:19 +00:00
|
|
|
* x, y mouse coord near edge
|
2012-03-03 16:31:46 +00:00
|
|
|
* delta movement of edge
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* functions:
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* init() set default property values, find edge based on mouse coords, test
|
|
|
|
* if the edge can be moved, select edges, calculate min and max movement
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* apply() apply delta on selection
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* exit() cleanup, send notifier
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* cancel() cancel moving
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* callbacks:
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* exec() execute without any user interaction, based on properties
|
|
|
|
* call init(), apply(), exit()
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* invoke() gets called on mouse click near edge
|
|
|
|
* call init(), add handler
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* modal() accept modal events while doing it
|
|
|
|
* call apply() with delta motion
|
|
|
|
* call exit() and remove handler
|
2009-12-10 09:25:30 +00:00
|
|
|
*/
|
2008-11-19 16:28:11 +00:00
|
|
|
|
|
|
|
typedef struct sAreaMoveData {
|
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
|
|
|
int bigger, smaller, origval, step;
|
2008-11-19 16:28:11 +00:00
|
|
|
char dir;
|
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
|
|
|
enum AreaMoveSnapType {
|
|
|
|
/* Snapping disabled */
|
|
|
|
SNAP_NONE = 0,
|
2018-06-02 03:17:51 -03:00
|
|
|
/* Snap to an invisible grid with a unit defined in AREAGRID */
|
|
|
|
SNAP_AREAGRID,
|
2018-07-13 08:18:18 +02:00
|
|
|
/* Snap to fraction (half, third.. etc) and adjacent edges. */
|
|
|
|
SNAP_FRACTION_AND_ADJACENT,
|
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
|
|
|
/* Snap to either bigger or smaller, nothing in-between (used for
|
|
|
|
* global areas). This has priority over other snap types, if it is
|
2018-07-13 08:18:18 +02:00
|
|
|
* used, toggling SNAP_FRACTION_AND_ADJACENT doesn't work. */
|
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
|
|
|
SNAP_BIGGER_SMALLER_ONLY,
|
|
|
|
} snap_type;
|
2008-11-19 16:28:11 +00:00
|
|
|
} sAreaMoveData;
|
|
|
|
|
2013-11-25 13:40:58 +01:00
|
|
|
/* helper call to move area-edge, sets limits
|
2018-05-23 22:38:25 +02:00
|
|
|
* need window bounds in order to get correct limits */
|
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 void area_move_set_limits(
|
|
|
|
wmWindow *win, bScreen *sc, int dir,
|
|
|
|
int *bigger, int *smaller,
|
|
|
|
bool *use_bigger_smaller_snap)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2018-06-28 20:15:09 +02:00
|
|
|
rcti window_rect;
|
2013-11-25 13:40:58 +01:00
|
|
|
int areaminy = ED_area_headersize();
|
|
|
|
int areamin;
|
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
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* we check all areas and test for free space with MINSIZE */
|
2012-05-08 11:48:19 +00:00
|
|
|
*bigger = *smaller = 100000;
|
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 (use_bigger_smaller_snap != NULL) {
|
|
|
|
*use_bigger_smaller_snap = false;
|
|
|
|
for (ScrArea *area = win->global_areas.areabase.first; area; area = area->next) {
|
2018-06-30 16:51:31 +02:00
|
|
|
int size_min = ED_area_global_min_size_y(area) - 1;
|
|
|
|
int size_max = ED_area_global_max_size_y(area) - 1;
|
|
|
|
|
2019-01-23 14:44:40 +01:00
|
|
|
size_min = max_ii(size_min, 0);
|
2018-06-30 16:51:31 +02:00
|
|
|
BLI_assert(size_min < size_max);
|
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
|
|
|
|
|
|
|
/* logic here is only tested for lower edge :) */
|
|
|
|
/* left edge */
|
|
|
|
if ((area->v1->editflag && area->v2->editflag)) {
|
|
|
|
*smaller = area->v4->vec.x - size_max;
|
|
|
|
*bigger = area->v4->vec.x - size_min;
|
|
|
|
*use_bigger_smaller_snap = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* top edge */
|
|
|
|
else if ((area->v2->editflag && area->v3->editflag)) {
|
|
|
|
*smaller = area->v1->vec.y + size_min;
|
|
|
|
*bigger = area->v1->vec.y + size_max;
|
|
|
|
*use_bigger_smaller_snap = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* right edge */
|
|
|
|
else if ((area->v3->editflag && area->v4->editflag)) {
|
|
|
|
*smaller = area->v1->vec.x + size_min;
|
|
|
|
*bigger = area->v1->vec.x + size_max;
|
|
|
|
*use_bigger_smaller_snap = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* lower edge */
|
|
|
|
else if ((area->v4->editflag && area->v1->editflag)) {
|
|
|
|
*smaller = area->v2->vec.y - size_max;
|
|
|
|
*bigger = area->v2->vec.y - size_min;
|
|
|
|
*use_bigger_smaller_snap = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-28 20:15:09 +02:00
|
|
|
WM_window_rect_calc(win, &window_rect);
|
|
|
|
|
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
|
|
|
for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
|
2012-05-08 11:48:19 +00:00
|
|
|
if (dir == 'h') {
|
2013-11-25 13:40:58 +01:00
|
|
|
int y1;
|
|
|
|
areamin = areaminy;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-28 20:15:09 +02:00
|
|
|
if (sa->v1->vec.y > window_rect.ymin)
|
2013-11-25 13:40:58 +01:00
|
|
|
areamin += U.pixelsize;
|
2018-06-28 20:15:09 +02:00
|
|
|
if (sa->v2->vec.y < (window_rect.ymax - 1))
|
2013-11-25 13:40:58 +01:00
|
|
|
areamin += U.pixelsize;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-30 01:56:07 +02:00
|
|
|
y1 = screen_geom_area_height(sa) - areamin;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* if top or down edge selected, test height */
|
2012-12-15 09:45:34 +00:00
|
|
|
if (sa->v1->editflag && sa->v4->editflag)
|
2012-10-24 05:06:40 +00:00
|
|
|
*bigger = min_ii(*bigger, y1);
|
2012-12-15 09:45:34 +00:00
|
|
|
else if (sa->v2->editflag && sa->v3->editflag)
|
2012-10-24 05:06:40 +00:00
|
|
|
*smaller = min_ii(*smaller, y1);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
else {
|
2013-11-25 13:40:58 +01:00
|
|
|
int x1;
|
|
|
|
areamin = AREAMINX;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-28 20:15:09 +02:00
|
|
|
if (sa->v1->vec.x > window_rect.xmin)
|
2013-11-25 13:40:58 +01:00
|
|
|
areamin += U.pixelsize;
|
2018-06-28 20:15:09 +02:00
|
|
|
if (sa->v4->vec.x < (window_rect.xmax - 1))
|
2013-11-25 13:40:58 +01:00
|
|
|
areamin += U.pixelsize;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-30 01:56:07 +02:00
|
|
|
x1 = screen_geom_area_width(sa) - areamin;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* if left or right edge selected, test width */
|
2012-12-15 09:45:34 +00:00
|
|
|
if (sa->v1->editflag && sa->v2->editflag)
|
2012-10-24 05:06:40 +00:00
|
|
|
*bigger = min_ii(*bigger, x1);
|
2012-12-15 09:45:34 +00:00
|
|
|
else if (sa->v3->editflag && sa->v4->editflag)
|
2012-10-24 05:06:40 +00:00
|
|
|
*smaller = min_ii(*smaller, x1);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* validate selection inside screen, set variables OK */
|
|
|
|
/* return 0: init failed */
|
2012-05-08 11:48:19 +00:00
|
|
|
static int area_move_init(bContext *C, wmOperator *op)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
2013-11-25 13:40:58 +01:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2008-11-19 16:28:11 +00:00
|
|
|
ScrEdge *actedge;
|
|
|
|
sAreaMoveData *md;
|
|
|
|
int x, y;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* required properties */
|
2012-05-08 11:48:19 +00:00
|
|
|
x = RNA_int_get(op->ptr, "x");
|
|
|
|
y = RNA_int_get(op->ptr, "y");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* setup */
|
2018-06-30 01:56:07 +02:00
|
|
|
actedge = screen_geom_find_active_scredge(win, sc, x, y);
|
2012-05-08 11:48:19 +00:00
|
|
|
if (actedge == NULL) return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
md = MEM_callocN(sizeof(sAreaMoveData), "sAreaMoveData");
|
|
|
|
op->customdata = md;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-30 01:56:07 +02:00
|
|
|
md->dir = screen_geom_edge_is_horizontal(actedge) ? 'h' : 'v';
|
2012-05-08 11:48:19 +00:00
|
|
|
if (md->dir == 'h') md->origval = actedge->v1->vec.y;
|
|
|
|
else md->origval = actedge->v1->vec.x;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-30 01:56:07 +02:00
|
|
|
screen_geom_select_connected_edge(win, actedge);
|
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
|
|
|
/* now all vertices with 'flag == 1' are the ones that can be moved. Move this to editflag */
|
|
|
|
ED_screen_verts_iter(win, sc, v1) {
|
2012-12-15 16:22:18 +00:00
|
|
|
v1->editflag = v1->flag;
|
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
|
|
|
}
|
|
|
|
|
|
|
|
bool use_bigger_smaller_snap = false;
|
2018-06-28 20:15:09 +02:00
|
|
|
area_move_set_limits(win, sc, md->dir, &md->bigger, &md->smaller, &use_bigger_smaller_snap);
|
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-06-02 03:17:51 -03:00
|
|
|
md->snap_type = use_bigger_smaller_snap ? SNAP_BIGGER_SMALLER_ONLY : SNAP_AREAGRID;
|
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
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-01-18 11:22:58 +11:00
|
|
|
static int area_snap_calc_location(
|
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 bScreen *sc, const enum AreaMoveSnapType snap_type,
|
|
|
|
const int delta, const int origval, const int dir,
|
2018-01-18 11:22:58 +11:00
|
|
|
const int bigger, const int smaller)
|
|
|
|
{
|
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
|
|
|
BLI_assert(snap_type != SNAP_NONE);
|
2018-07-13 08:14:16 +02:00
|
|
|
int m_cursor_final = -1;
|
|
|
|
const int m_cursor = origval + delta;
|
|
|
|
const int m_span = (float)(bigger + smaller);
|
|
|
|
const int m_min = origval - smaller;
|
|
|
|
// const int axis_max = axis_min + m_span;
|
2018-01-18 11:22:58 +11:00
|
|
|
|
2018-06-02 03:17:51 -03:00
|
|
|
switch (snap_type) {
|
|
|
|
case SNAP_AREAGRID:
|
2018-07-13 08:14:16 +02:00
|
|
|
m_cursor_final = m_cursor;
|
2018-06-02 03:17:51 -03:00
|
|
|
if (delta != bigger && delta != -smaller) {
|
2018-07-13 08:14:16 +02:00
|
|
|
m_cursor_final -= (m_cursor % AREAGRID);
|
|
|
|
CLAMP(m_cursor_final, origval - smaller, origval + bigger);
|
2018-06-02 03:17:51 -03:00
|
|
|
}
|
|
|
|
break;
|
2018-01-18 11:22:58 +11:00
|
|
|
|
2018-06-02 03:17:51 -03:00
|
|
|
case SNAP_BIGGER_SMALLER_ONLY:
|
2018-07-13 08:14:16 +02:00
|
|
|
m_cursor_final = (m_cursor >= bigger) ? bigger : smaller;
|
2018-06-02 03:17:51 -03:00
|
|
|
break;
|
|
|
|
|
2018-07-13 08:18:18 +02:00
|
|
|
case SNAP_FRACTION_AND_ADJACENT:
|
2018-06-02 03:17:51 -03:00
|
|
|
{
|
|
|
|
const int axis = (dir == 'v') ? 0 : 1;
|
2018-07-13 08:14:16 +02:00
|
|
|
int snap_dist_best = INT_MAX;
|
2018-06-02 03:17:51 -03:00
|
|
|
{
|
2018-07-12 16:55:16 +02:00
|
|
|
const float div_array[] = {
|
|
|
|
/* Middle. */
|
|
|
|
1.0f / 2.0f,
|
|
|
|
/* Thirds. */
|
|
|
|
1.0f / 3.0f, 2.0f / 3.0f,
|
|
|
|
/* Quaters. */
|
|
|
|
1.0f / 4.0f, 3.0f / 4.0f,
|
|
|
|
/* Eighth. */
|
|
|
|
1.0f / 8.0f, 3.0f / 8.0f,
|
|
|
|
5.0f / 8.0f, 7.0f / 8.0f,
|
|
|
|
};
|
|
|
|
/* Test the snap to the best division. */
|
|
|
|
for (int i = 0; i < ARRAY_SIZE(div_array); i++) {
|
2018-07-13 08:14:16 +02:00
|
|
|
const int m_cursor_test = m_min + round_fl_to_int(m_span * div_array[i]);
|
|
|
|
const int snap_dist_test = abs(m_cursor - m_cursor_test);
|
|
|
|
if (snap_dist_best >= snap_dist_test) {
|
|
|
|
snap_dist_best = snap_dist_test;
|
|
|
|
m_cursor_final = m_cursor_test;
|
2018-07-12 16:55:16 +02:00
|
|
|
}
|
|
|
|
}
|
2018-06-02 03:17:51 -03:00
|
|
|
}
|
2018-01-18 11:22:58 +11:00
|
|
|
|
2018-06-02 03:17:51 -03:00
|
|
|
for (const ScrVert *v1 = sc->vertbase.first; v1; v1 = v1->next) {
|
|
|
|
if (!v1->editflag) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
const int v_loc = (&v1->vec.x)[!axis];
|
2018-01-18 11:22:58 +11:00
|
|
|
|
2018-06-02 03:17:51 -03:00
|
|
|
for (const ScrVert *v2 = sc->vertbase.first; v2; v2 = v2->next) {
|
|
|
|
if (v2->editflag) {
|
|
|
|
continue;
|
|
|
|
}
|
2018-01-18 11:22:58 +11:00
|
|
|
if (v_loc == (&v2->vec.x)[!axis]) {
|
|
|
|
const int v_loc2 = (&v2->vec.x)[axis];
|
|
|
|
/* Do not snap to the vertices at the ends. */
|
|
|
|
if ((origval - smaller) < v_loc2 && v_loc2 < (origval + bigger)) {
|
2018-07-13 08:14:16 +02:00
|
|
|
const int snap_dist_test = abs(m_cursor - v_loc2);
|
|
|
|
if (snap_dist_best >= snap_dist_test) {
|
|
|
|
snap_dist_best = snap_dist_test;
|
|
|
|
m_cursor_final = v_loc2;
|
2018-01-18 11:22:58 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-06-02 03:17:51 -03:00
|
|
|
break;
|
2018-01-18 11:22:58 +11:00
|
|
|
}
|
2018-06-02 21:38:31 +02:00
|
|
|
case SNAP_NONE:
|
|
|
|
break;
|
2018-01-18 11:22:58 +11:00
|
|
|
}
|
|
|
|
|
2018-06-30 16:51:31 +02:00
|
|
|
BLI_assert(ELEM(snap_type, SNAP_BIGGER_SMALLER_ONLY) ||
|
2018-07-13 08:14:16 +02:00
|
|
|
IN_RANGE_INCL(m_cursor_final, origval - smaller, origval + bigger));
|
2018-06-28 20:15:09 +02:00
|
|
|
|
2018-07-13 08:14:16 +02:00
|
|
|
return m_cursor_final;
|
2018-01-18 11:22:58 +11:00
|
|
|
}
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* moves selected screen edge amount of delta, used by split & move */
|
2018-01-18 11:22:58 +11:00
|
|
|
static void area_move_apply_do(
|
|
|
|
const bContext *C, int delta,
|
|
|
|
const int origval, const int dir,
|
|
|
|
const int bigger, const int smaller,
|
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 enum AreaMoveSnapType snap_type)
|
2008-11-19 16:28:11 +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
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
2018-06-29 02:04:46 +02:00
|
|
|
short final_loc = -1;
|
2018-01-18 11:22:58 +11:00
|
|
|
bool doredraw = false;
|
|
|
|
|
2018-06-30 16:51:31 +02:00
|
|
|
if (snap_type != SNAP_BIGGER_SMALLER_ONLY) {
|
|
|
|
CLAMP(delta, -smaller, bigger);
|
|
|
|
}
|
2018-01-18 11:22:58 +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
|
|
|
if (snap_type == SNAP_NONE) {
|
2018-01-18 11:22:58 +11:00
|
|
|
final_loc = origval + delta;
|
|
|
|
}
|
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 {
|
|
|
|
final_loc = area_snap_calc_location(sc, snap_type, delta, origval, dir, bigger, smaller);
|
|
|
|
}
|
2018-01-18 11:22:58 +11:00
|
|
|
|
|
|
|
BLI_assert(final_loc != -1);
|
|
|
|
short axis = (dir == 'v') ? 0 : 1;
|
|
|
|
|
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
|
|
|
ED_screen_verts_iter(win, sc, v1) {
|
2012-12-15 09:45:34 +00:00
|
|
|
if (v1->editflag) {
|
2018-01-18 11:22:58 +11:00
|
|
|
short oldval = (&v1->vec.x)[axis];
|
|
|
|
(&v1->vec.x)[axis] = final_loc;
|
|
|
|
|
|
|
|
if (oldval == final_loc) {
|
|
|
|
/* nothing will change to the other vertices either. */
|
|
|
|
break;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-01-18 11:22:58 +11:00
|
|
|
doredraw = true;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
2010-07-25 01:39:47 +00:00
|
|
|
|
2013-11-25 13:40:58 +01:00
|
|
|
/* only redraw if we actually moved a screen vert, for AREAGRID */
|
|
|
|
if (doredraw) {
|
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
|
|
|
bool redraw_all = false;
|
|
|
|
ED_screen_areas_iter(win, sc, sa) {
|
2018-01-18 11:22:58 +11:00
|
|
|
if (sa->v1->editflag || sa->v2->editflag || sa->v3->editflag || sa->v4->editflag) {
|
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 (ED_area_is_global(sa)) {
|
2018-08-17 17:32:36 +02:00
|
|
|
/* Snap to minimum or maximum for global areas. */
|
|
|
|
int height = round_fl_to_int(screen_geom_area_height(sa) / UI_DPI_FAC);
|
|
|
|
if (abs(height - sa->global->size_min) < abs(height - sa->global->size_max)) {
|
|
|
|
sa->global->cur_fixed_height = sa->global->size_min;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sa->global->cur_fixed_height = sa->global->size_max;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
sc->do_refresh = true;
|
|
|
|
redraw_all = true;
|
|
|
|
}
|
2013-11-25 13:40:58 +01:00
|
|
|
ED_area_tag_redraw(sa);
|
2018-01-18 11:22:58 +11:00
|
|
|
}
|
2013-11-25 13:40:58 +01: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 (redraw_all) {
|
|
|
|
ED_screen_areas_iter(win, sc, sa) {
|
|
|
|
ED_area_tag_redraw(sa);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-17 17:32:36 +02:00
|
|
|
ED_screen_global_areas_sync(win);
|
|
|
|
|
2013-11-25 13:40:58 +01:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL); /* redraw everything */
|
2016-12-01 16:43:57 +01:00
|
|
|
/* Update preview thumbnail */
|
|
|
|
BKE_icon_changed(sc->id.icon_id);
|
2013-11-25 13:40:58 +01:00
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void area_move_apply(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
sAreaMoveData *md = op->customdata;
|
2018-01-18 11:22:58 +11:00
|
|
|
int delta = RNA_int_get(op->ptr, "delta");
|
|
|
|
|
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
|
|
|
area_move_apply_do(C, delta, md->origval, md->dir, md->bigger, md->smaller, md->snap_type);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void area_move_exit(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (op->customdata)
|
2008-11-19 16:28:11 +00:00
|
|
|
MEM_freeN(op->customdata);
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* this makes sure aligned edges will result in aligned grabbing */
|
2018-04-13 21:43:57 +02:00
|
|
|
BKE_screen_remove_double_scrverts(CTX_wm_screen(C));
|
|
|
|
BKE_screen_remove_double_scredges(CTX_wm_screen(C));
|
2018-11-28 13:50:15 +11:00
|
|
|
|
|
|
|
G.moving &= ~G_TRANSFORM_WM;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int area_move_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!area_move_init(C, op))
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
area_move_apply(C, op);
|
|
|
|
area_move_exit(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* interaction callback */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_move_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2008-11-24 15:51:55 +00:00
|
|
|
RNA_int_set(op->ptr, "x", event->x);
|
|
|
|
RNA_int_set(op->ptr, "y", event->y);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
|
|
|
if (!area_move_init(C, op))
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-11-28 13:50:15 +11:00
|
|
|
G.moving |= G_TRANSFORM_WM;
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* add temp handler */
|
2009-10-22 23:22:05 +00:00
|
|
|
WM_event_add_modal_handler(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void area_move_cancel(bContext *C, wmOperator *op)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-24 15:51:55 +00:00
|
|
|
RNA_int_set(op->ptr, "delta", 0);
|
2008-11-19 16:28:11 +00:00
|
|
|
area_move_apply(C, op);
|
|
|
|
area_move_exit(C, op);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* modal callback for while moving edges */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_move_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
sAreaMoveData *md = op->customdata;
|
2008-11-19 16:28:11 +00:00
|
|
|
int delta, x, y;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* execute the events */
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (event->type) {
|
2008-11-19 16:28:11 +00:00
|
|
|
case MOUSEMOVE:
|
2013-07-21 08:16:37 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
x = RNA_int_get(op->ptr, "x");
|
|
|
|
y = RNA_int_get(op->ptr, "y");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
delta = (md->dir == 'v') ? event->x - x : event->y - y;
|
2008-11-24 15:51:55 +00:00
|
|
|
RNA_int_set(op->ptr, "delta", delta);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
area_move_apply(C, op);
|
|
|
|
break;
|
2013-07-21 08:16:37 +00:00
|
|
|
}
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
case EVT_MODAL_MAP:
|
2013-07-21 08:16:37 +00:00
|
|
|
{
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
switch (event->val) {
|
|
|
|
case KM_MODAL_APPLY:
|
|
|
|
area_move_exit(C, op);
|
|
|
|
return OPERATOR_FINISHED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
case KM_MODAL_CANCEL:
|
2013-10-30 23:08:53 +00:00
|
|
|
area_move_cancel(C, op);
|
|
|
|
return OPERATOR_CANCELLED;
|
2018-01-18 11:22:58 +11:00
|
|
|
|
|
|
|
case KM_MODAL_SNAP_ON:
|
2018-06-02 03:17:51 -03:00
|
|
|
if (md->snap_type != SNAP_BIGGER_SMALLER_ONLY) {
|
2018-07-13 08:18:18 +02:00
|
|
|
md->snap_type = SNAP_FRACTION_AND_ADJACENT;
|
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
|
|
|
}
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
break;
|
2018-06-02 03:17:51 -03:00
|
|
|
|
2018-01-18 11:22:58 +11:00
|
|
|
case KM_MODAL_SNAP_OFF:
|
2018-06-02 03:17:51 -03:00
|
|
|
if (md->snap_type != SNAP_BIGGER_SMALLER_ONLY) {
|
|
|
|
md->snap_type = SNAP_AREAGRID;
|
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
|
|
|
}
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-07-21 08:16:37 +00:00
|
|
|
break;
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_area_move(wmOperatorType *ot)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2013-01-27 07:23:58 +00:00
|
|
|
ot->name = "Move Area Edges";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Move selected area edges";
|
|
|
|
ot->idname = "SCREEN_OT_area_move";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = area_move_exec;
|
|
|
|
ot->invoke = area_move_invoke;
|
|
|
|
ot->cancel = area_move_cancel;
|
|
|
|
ot->modal = area_move_modal;
|
|
|
|
ot->poll = ED_operator_screen_mainwinactive; /* when mouse is over area-edge */
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-02-26 13:48:41 +11:00
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-21 19:14:38 +00:00
|
|
|
/* rna */
|
2009-01-16 23:53:11 +00:00
|
|
|
RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
|
|
|
|
RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX);
|
|
|
|
RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Split Area Operator
|
|
|
|
* \{ */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-03-23 11:51:19 +01:00
|
|
|
/*
|
|
|
|
* operator state vars:
|
2012-03-03 16:31:46 +00:00
|
|
|
* fac spit point
|
|
|
|
* dir direction 'v' or 'h'
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* operator customdata:
|
2012-05-08 11:48:19 +00:00
|
|
|
* area pointer to (active) area
|
2018-03-23 11:51:19 +01:00
|
|
|
* x, y last used mouse pos
|
2012-03-03 16:31:46 +00:00
|
|
|
* (more, see below)
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* functions:
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* init() set default property values, find area based on context
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
|
|
|
* apply() split area based on state vars
|
|
|
|
*
|
|
|
|
* exit() cleanup, send notifier
|
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* cancel() remove duplicated area
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* callbacks:
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* exec() execute without any user interaction, based on state vars
|
|
|
|
* call init(), apply(), exit()
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* invoke() gets called on mouse click in action-widget
|
|
|
|
* call init(), add modal handler
|
|
|
|
* call apply() with initial motion
|
2018-03-23 11:51:19 +01:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* modal() accept modal events while doing it
|
|
|
|
* call move-areas code with delta motion
|
|
|
|
* call exit() or cancel() and remove handler
|
2009-12-10 09:25:30 +00:00
|
|
|
*/
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
typedef struct sAreaSplitData {
|
2012-05-08 11:48:19 +00:00
|
|
|
int origval; /* for move areas */
|
|
|
|
int bigger, smaller; /* constraints for moving new edge */
|
|
|
|
int delta; /* delta move edge */
|
|
|
|
int origmin, origsize; /* to calculate fac, for property storage */
|
|
|
|
int previewmode; /* draw previewline, then split */
|
2018-01-19 17:14:27 +11:00
|
|
|
void *draw_callback; /* call `ED_screen_draw_split_preview` */
|
2018-01-18 11:22:58 +11:00
|
|
|
bool do_snap;
|
2012-05-08 11:48:19 +00:00
|
|
|
|
|
|
|
ScrEdge *nedge; /* new edge */
|
|
|
|
ScrArea *sarea; /* start area */
|
|
|
|
ScrArea *narea; /* new area */
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
} sAreaSplitData;
|
|
|
|
|
2018-01-19 17:14:27 +11:00
|
|
|
static void area_split_draw_cb(const struct wmWindow *UNUSED(win), void *userdata)
|
|
|
|
{
|
|
|
|
const wmOperator *op = userdata;
|
|
|
|
|
|
|
|
sAreaSplitData *sd = op->customdata;
|
|
|
|
if (sd->sarea) {
|
|
|
|
int dir = RNA_enum_get(op->ptr, "direction");
|
|
|
|
float fac = RNA_float_get(op->ptr, "factor");
|
|
|
|
|
|
|
|
ED_screen_draw_split_preview(sd->sarea, dir, fac);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
/* generic init, menu case, doesn't need active area */
|
|
|
|
static int area_split_menu_init(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
sAreaSplitData *sd;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
/* custom data */
|
2012-06-17 09:58:26 +00:00
|
|
|
sd = (sAreaSplitData *)MEM_callocN(sizeof(sAreaSplitData), "op_area_split");
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = sd;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
sd->sarea = CTX_wm_area(C);
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* generic init, no UI stuff here, assumes active area */
|
2008-11-19 16:28:11 +00:00
|
|
|
static int area_split_init(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2008-11-19 16:28:11 +00:00
|
|
|
sAreaSplitData *sd;
|
2018-06-02 03:17:51 -03:00
|
|
|
int areaminy = ED_area_headersize();
|
2008-11-19 16:28:11 +00:00
|
|
|
int dir;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* required context */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sa == NULL) return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* required properties */
|
2012-05-08 11:48:19 +00:00
|
|
|
dir = RNA_enum_get(op->ptr, "direction");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* minimal size */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (dir == 'v' && sa->winx < 2 * AREAMINX) return 0;
|
|
|
|
if (dir == 'h' && sa->winy < 2 * areaminy) return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* custom data */
|
2012-06-17 09:58:26 +00:00
|
|
|
sd = (sAreaSplitData *)MEM_callocN(sizeof(sAreaSplitData), "op_area_split");
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = sd;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
sd->sarea = sa;
|
2018-06-02 03:17:51 -03:00
|
|
|
if (dir == 'v') {
|
|
|
|
sd->origmin = sa->v1->vec.x;
|
|
|
|
sd->origsize = sa->v4->vec.x - sd->origmin;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sd->origmin = sa->v1->vec.y;
|
|
|
|
sd->origsize = sa->v2->vec.y - sd->origmin;
|
|
|
|
}
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* with sa as center, sb is located at: 0=W, 1=N, 2=E, 3=S */
|
|
|
|
/* used with split operator */
|
|
|
|
static ScrEdge *area_findsharededge(bScreen *screen, ScrArea *sa, ScrArea *sb)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
ScrVert *sav1 = sa->v1;
|
|
|
|
ScrVert *sav2 = sa->v2;
|
|
|
|
ScrVert *sav3 = sa->v3;
|
|
|
|
ScrVert *sav4 = sa->v4;
|
|
|
|
ScrVert *sbv1 = sb->v1;
|
|
|
|
ScrVert *sbv2 = sb->v2;
|
|
|
|
ScrVert *sbv3 = sb->v3;
|
|
|
|
ScrVert *sbv4 = sb->v4;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sav1 == sbv4 && sav2 == sbv3) { /* sa to right of sb = W */
|
2018-04-13 21:43:57 +02:00
|
|
|
return BKE_screen_find_edge(screen, sav1, sav2);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (sav2 == sbv1 && sav3 == sbv4) { /* sa to bottom of sb = N */
|
2018-04-13 21:43:57 +02:00
|
|
|
return BKE_screen_find_edge(screen, sav2, sav3);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (sav3 == sbv2 && sav4 == sbv1) { /* sa to left of sb = E */
|
2018-04-13 21:43:57 +02:00
|
|
|
return BKE_screen_find_edge(screen, sav3, sav4);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (sav1 == sbv2 && sav4 == sbv3) { /* sa on top of sb = S*/
|
2018-04-13 21:43:57 +02:00
|
|
|
return BKE_screen_find_edge(screen, sav1, sav4);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Lots of stuff; couldn't commit in parts because of refactor work.
* Changes in interface/ module
This commit brings back the way how buttons/menus work under control
of WM event system. The previous implementation extended usage of
handlers and operators in an interesting but confusing way. Better to
try it first according the design specs. :)
Most obviously:
- modal-handler operators are not stored anymore in regions/areas/windows.
such modal handlers own their operator, and should remove it themselves.
- removed code to move handlers from one queue to another.
(needs review with brecht!)
- WM fix: the API call to remove a modal handler got removed. This was a
dangerous thing anyway, and you should leave that to the event system.
Now, if a handler modal() call gets a cancel/finish return, it frees
itself in event system. WM_event_remove_modal_handler was a confusing
call anyway!
Todo:
- allow button-activate to refresh after using button
- re-enable arrow keys for menus
(do both after commit)
- review return values of operator callbacks in interface_ops.c
* Fixes in WM system
- Freeing areas/regions/windows, also on quit, now correctly closes
running modal handlers
- On starting a modal handler, the handler now stores previous area
and region context, so they send proper notifiers etc.
* Other fixes
- Area-split operator had bug, wrong minimal size checking. This
solves error when trying to split a very narrow area.
- removed DNA_USHORT_FIX from screen_types.h, gave warning
- operators didn't get ID name copied when activated, needed for
later re-use or saving.
2008-12-02 14:22:52 +00:00
|
|
|
/* do the split, return success */
|
|
|
|
static int area_split_apply(bContext *C, wmOperator *op)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2018-06-30 15:36:00 +02:00
|
|
|
const wmWindow *win = CTX_wm_window(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
|
|
|
sAreaSplitData *sd = (sAreaSplitData *)op->customdata;
|
2008-11-19 16:28:11 +00:00
|
|
|
float fac;
|
|
|
|
int dir;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
fac = RNA_float_get(op->ptr, "factor");
|
|
|
|
dir = RNA_enum_get(op->ptr, "direction");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-30 15:36:00 +02:00
|
|
|
sd->narea = area_split(win, sc, sd->sarea, dir, fac, 0); /* 0 = no merge */
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sd->narea) {
|
2012-05-08 11:48:19 +00:00
|
|
|
sd->nedge = area_findsharededge(sc, sd->sarea, sd->narea);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* select newly created edge, prepare for moving edge */
|
2018-06-30 15:36:00 +02:00
|
|
|
ED_screen_verts_iter(win, sc, sv) {
|
2012-12-15 09:45:34 +00:00
|
|
|
sv->editflag = 0;
|
2018-06-30 15:36:00 +02:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-12-15 09:45:34 +00:00
|
|
|
sd->nedge->v1->editflag = 1;
|
|
|
|
sd->nedge->v2->editflag = 1;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (dir == 'h') sd->origval = sd->nedge->v1->vec.y;
|
|
|
|
else sd->origval = sd->nedge->v1->vec.x;
|
2010-01-16 22:56:52 +00:00
|
|
|
|
|
|
|
ED_area_tag_redraw(sd->sarea);
|
|
|
|
ED_area_tag_redraw(sd->narea);
|
2010-07-25 01:39:47 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2016-12-01 16:43:57 +01:00
|
|
|
/* Update preview thumbnail */
|
|
|
|
BKE_icon_changed(sc->id.icon_id);
|
|
|
|
|
Lots of stuff; couldn't commit in parts because of refactor work.
* Changes in interface/ module
This commit brings back the way how buttons/menus work under control
of WM event system. The previous implementation extended usage of
handlers and operators in an interesting but confusing way. Better to
try it first according the design specs. :)
Most obviously:
- modal-handler operators are not stored anymore in regions/areas/windows.
such modal handlers own their operator, and should remove it themselves.
- removed code to move handlers from one queue to another.
(needs review with brecht!)
- WM fix: the API call to remove a modal handler got removed. This was a
dangerous thing anyway, and you should leave that to the event system.
Now, if a handler modal() call gets a cancel/finish return, it frees
itself in event system. WM_event_remove_modal_handler was a confusing
call anyway!
Todo:
- allow button-activate to refresh after using button
- re-enable arrow keys for menus
(do both after commit)
- review return values of operator callbacks in interface_ops.c
* Fixes in WM system
- Freeing areas/regions/windows, also on quit, now correctly closes
running modal handlers
- On starting a modal handler, the handler now stores previous area
and region context, so they send proper notifiers etc.
* Other fixes
- Area-split operator had bug, wrong minimal size checking. This
solves error when trying to split a very narrow area.
- removed DNA_USHORT_FIX from screen_types.h, gave warning
- operators didn't get ID name copied when activated, needed for
later re-use or saving.
2008-12-02 14:22:52 +00:00
|
|
|
return 1;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Lots of stuff; couldn't commit in parts because of refactor work.
* Changes in interface/ module
This commit brings back the way how buttons/menus work under control
of WM event system. The previous implementation extended usage of
handlers and operators in an interesting but confusing way. Better to
try it first according the design specs. :)
Most obviously:
- modal-handler operators are not stored anymore in regions/areas/windows.
such modal handlers own their operator, and should remove it themselves.
- removed code to move handlers from one queue to another.
(needs review with brecht!)
- WM fix: the API call to remove a modal handler got removed. This was a
dangerous thing anyway, and you should leave that to the event system.
Now, if a handler modal() call gets a cancel/finish return, it frees
itself in event system. WM_event_remove_modal_handler was a confusing
call anyway!
Todo:
- allow button-activate to refresh after using button
- re-enable arrow keys for menus
(do both after commit)
- review return values of operator callbacks in interface_ops.c
* Fixes in WM system
- Freeing areas/regions/windows, also on quit, now correctly closes
running modal handlers
- On starting a modal handler, the handler now stores previous area
and region context, so they send proper notifiers etc.
* Other fixes
- Area-split operator had bug, wrong minimal size checking. This
solves error when trying to split a very narrow area.
- removed DNA_USHORT_FIX from screen_types.h, gave warning
- operators didn't get ID name copied when activated, needed for
later re-use or saving.
2008-12-02 14:22:52 +00:00
|
|
|
return 0;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void area_split_exit(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
if (op->customdata) {
|
2012-05-08 11:48:19 +00:00
|
|
|
sAreaSplitData *sd = (sAreaSplitData *)op->customdata;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sd->sarea) ED_area_tag_redraw(sd->sarea);
|
|
|
|
if (sd->narea) ED_area_tag_redraw(sd->narea);
|
2010-01-16 22:56:52 +00:00
|
|
|
|
2018-01-19 17:14:27 +11:00
|
|
|
if (sd->draw_callback)
|
|
|
|
WM_draw_cb_exit(CTX_wm_window(C), sd->draw_callback);
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
MEM_freeN(op->customdata);
|
|
|
|
op->customdata = NULL;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-09-06 22:34:29 +00:00
|
|
|
WM_cursor_modal_restore(CTX_wm_window(C));
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* this makes sure aligned edges will result in aligned grabbing */
|
2018-04-13 21:43:57 +02:00
|
|
|
BKE_screen_remove_double_scrverts(CTX_wm_screen(C));
|
|
|
|
BKE_screen_remove_double_scredges(CTX_wm_screen(C));
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 00:39:06 +11:00
|
|
|
static void area_split_preview_update_cursor(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
wmWindow *win = CTX_wm_window(C);
|
|
|
|
int dir = RNA_enum_get(op->ptr, "direction");
|
2019-02-21 17:22:51 +01:00
|
|
|
WM_cursor_set(win, (dir == 'n' || dir == 's') ? BC_V_SPLITCURSOR : BC_H_SPLITCURSOR);
|
2018-01-21 00:39:06 +11:00
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
|
|
|
|
/* UI callback, adds new handler */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_split_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2013-11-25 13:40:58 +01:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
2008-11-19 16:28:11 +00:00
|
|
|
sAreaSplitData *sd;
|
2011-03-02 14:09:54 +00:00
|
|
|
int dir;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-23 16:36:41 +00:00
|
|
|
/* no full window splitting allowed */
|
2018-07-02 12:24:21 +02:00
|
|
|
BLI_assert(sc->state == SCREENNORMAL);
|
2018-05-23 22:38:25 +02:00
|
|
|
|
2018-07-02 12:24:21 +02:00
|
|
|
PropertyRNA *prop_dir = RNA_struct_find_property(op->ptr, "direction");
|
|
|
|
PropertyRNA *prop_factor = RNA_struct_find_property(op->ptr, "factor");
|
|
|
|
PropertyRNA *prop_cursor = RNA_struct_find_property(op->ptr, "cursor");
|
2018-05-23 22:38:25 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->type == EVT_ACTIONZONE_AREA) {
|
|
|
|
sActionzoneData *sad = event->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-09-14 06:17:14 +00:00
|
|
|
if (sad == NULL || sad->modifier > 0) {
|
2009-03-05 23:19:44 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* verify *sad itself */
|
2012-09-14 06:17:14 +00:00
|
|
|
if (sad->sa1 == NULL || sad->az == NULL)
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* is this our *sad? if areas not equal it should be passed on */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (CTX_wm_area(C) != sad->sa1 || sad->sa1 != sad->sa2)
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-12-04 17:30:23 -02:00
|
|
|
/* The factor will be close to 1.0f when near the top-left and the bottom-right corners. */
|
|
|
|
const float factor_v = ((float)(event->y - sad->sa1->v1->vec.y)) / (float)sad->sa1->winy;
|
|
|
|
const float factor_h = ((float)(event->x - sad->sa1->v1->vec.x)) / (float)sad->sa1->winx;
|
|
|
|
const bool is_left = factor_v < 0.5f;
|
|
|
|
const bool is_bottom = factor_h < 0.5f;
|
|
|
|
const bool is_right = !is_left;
|
|
|
|
const bool is_top = !is_bottom;
|
|
|
|
float factor;
|
|
|
|
|
|
|
|
/* Prepare operator state vars. */
|
|
|
|
if (ELEM(sad->gesture_dir, 'n', 's')) {
|
2012-05-08 11:48:19 +00:00
|
|
|
dir = 'h';
|
2018-12-04 17:30:23 -02:00
|
|
|
factor = factor_h;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-08 11:48:19 +00:00
|
|
|
dir = 'v';
|
2018-12-04 17:30:23 -02:00
|
|
|
factor = factor_v;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-12-04 17:30:23 -02:00
|
|
|
|
|
|
|
if ((is_top && is_left) ||
|
|
|
|
(is_bottom && is_right))
|
|
|
|
{
|
|
|
|
factor = 1.0f - factor;
|
|
|
|
}
|
|
|
|
|
|
|
|
RNA_property_float_set(op->ptr, prop_factor, factor);
|
|
|
|
|
2018-07-02 12:24:21 +02:00
|
|
|
RNA_property_enum_set(op->ptr, prop_dir, dir);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* general init, also non-UI case, adds customdata, sets area and defaults */
|
2018-07-02 12:24:21 +02:00
|
|
|
if (!area_split_init(C, op)) {
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-07-02 12:24:21 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (RNA_property_is_set(op->ptr, prop_dir)) {
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
if (sa == NULL) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
dir = RNA_property_enum_get(op->ptr, prop_dir);
|
|
|
|
if (dir == 'h') {
|
|
|
|
RNA_property_float_set(
|
|
|
|
op->ptr, prop_factor,
|
|
|
|
((float)(event->x - sa->v1->vec.x)) / (float)sa->winx);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
RNA_property_float_set(
|
|
|
|
op->ptr, prop_factor,
|
|
|
|
((float)(event->y - sa->v1->vec.y)) / (float)sa->winy);
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-07-02 12:24:21 +02:00
|
|
|
if (!area_split_init(C, op)) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2011-03-02 14:09:54 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
ScrEdge *actedge;
|
2018-07-02 16:48:18 +02:00
|
|
|
rcti window_rect;
|
2018-07-02 12:24:21 +02:00
|
|
|
int event_co[2];
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
/* retrieve initial mouse coord, so we can find the active edge */
|
2018-07-02 12:24:21 +02:00
|
|
|
if (RNA_property_is_set(op->ptr, prop_cursor)) {
|
|
|
|
RNA_property_int_get_array(op->ptr, prop_cursor, event_co);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
copy_v2_v2_int(event_co, &event->x);
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-07-02 16:48:18 +02:00
|
|
|
WM_window_rect_calc(win, &window_rect);
|
2018-05-23 22:38:25 +02:00
|
|
|
|
2018-07-02 12:41:47 +02:00
|
|
|
actedge = screen_geom_area_map_find_active_scredge(
|
2018-07-02 16:48:18 +02:00
|
|
|
AREAMAP_FROM_SCREEN(sc), &window_rect, event_co[0], event_co[1]);
|
2018-07-02 12:24:21 +02:00
|
|
|
if (actedge == NULL) {
|
2011-03-02 14:09:54 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-07-02 12:24:21 +02:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-30 01:56:07 +02:00
|
|
|
dir = screen_geom_edge_is_horizontal(actedge) ? 'v' : 'h';
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-07-02 12:24:21 +02:00
|
|
|
RNA_property_enum_set(op->ptr, prop_dir, dir);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
/* special case, adds customdata, sets defaults */
|
2018-07-02 12:24:21 +02:00
|
|
|
if (!area_split_menu_init(C, op)) {
|
2011-03-02 14:09:54 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-07-02 12:24:21 +02:00
|
|
|
}
|
2011-03-02 14:09:54 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
sd = (sAreaSplitData *)op->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->type == EVT_ACTIONZONE_AREA) {
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* do the split */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (area_split_apply(C, op)) {
|
2018-06-28 20:15:09 +02:00
|
|
|
area_move_set_limits(win, sc, dir, &sd->bigger, &sd->smaller, NULL);
|
2018-05-23 22:38:25 +02:00
|
|
|
|
Lots of stuff; couldn't commit in parts because of refactor work.
* Changes in interface/ module
This commit brings back the way how buttons/menus work under control
of WM event system. The previous implementation extended usage of
handlers and operators in an interesting but confusing way. Better to
try it first according the design specs. :)
Most obviously:
- modal-handler operators are not stored anymore in regions/areas/windows.
such modal handlers own their operator, and should remove it themselves.
- removed code to move handlers from one queue to another.
(needs review with brecht!)
- WM fix: the API call to remove a modal handler got removed. This was a
dangerous thing anyway, and you should leave that to the event system.
Now, if a handler modal() call gets a cancel/finish return, it frees
itself in event system. WM_event_remove_modal_handler was a confusing
call anyway!
Todo:
- allow button-activate to refresh after using button
- re-enable arrow keys for menus
(do both after commit)
- review return values of operator callbacks in interface_ops.c
* Fixes in WM system
- Freeing areas/regions/windows, also on quit, now correctly closes
running modal handlers
- On starting a modal handler, the handler now stores previous area
and region context, so they send proper notifiers etc.
* Other fixes
- Area-split operator had bug, wrong minimal size checking. This
solves error when trying to split a very narrow area.
- removed DNA_USHORT_FIX from screen_types.h, gave warning
- operators didn't get ID name copied when activated, needed for
later re-use or saving.
2008-12-02 14:22:52 +00:00
|
|
|
/* add temp handler for edge move or cancel */
|
2009-10-22 23:22:05 +00:00
|
|
|
WM_event_add_modal_handler(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Lots of stuff; couldn't commit in parts because of refactor work.
* Changes in interface/ module
This commit brings back the way how buttons/menus work under control
of WM event system. The previous implementation extended usage of
handlers and operators in an interesting but confusing way. Better to
try it first according the design specs. :)
Most obviously:
- modal-handler operators are not stored anymore in regions/areas/windows.
such modal handlers own their operator, and should remove it themselves.
- removed code to move handlers from one queue to another.
(needs review with brecht!)
- WM fix: the API call to remove a modal handler got removed. This was a
dangerous thing anyway, and you should leave that to the event system.
Now, if a handler modal() call gets a cancel/finish return, it frees
itself in event system. WM_event_remove_modal_handler was a confusing
call anyway!
Todo:
- allow button-activate to refresh after using button
- re-enable arrow keys for menus
(do both after commit)
- review return values of operator callbacks in interface_ops.c
* Fixes in WM system
- Freeing areas/regions/windows, also on quit, now correctly closes
running modal handlers
- On starting a modal handler, the handler now stores previous area
and region context, so they send proper notifiers etc.
* Other fixes
- Area-split operator had bug, wrong minimal size checking. This
solves error when trying to split a very narrow area.
- removed DNA_USHORT_FIX from screen_types.h, gave warning
- operators didn't get ID name copied when activated, needed for
later re-use or saving.
2008-12-02 14:22:52 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2008-11-24 10:45:36 +00:00
|
|
|
else {
|
2012-05-08 11:48:19 +00:00
|
|
|
sd->previewmode = 1;
|
2018-01-19 17:14:27 +11:00
|
|
|
sd->draw_callback = WM_draw_cb_activate(win, area_split_draw_cb, op);
|
2011-03-02 14:09:54 +00:00
|
|
|
/* add temp handler for edge move or cancel */
|
|
|
|
WM_event_add_modal_handler(C, op);
|
2018-01-21 00:39:06 +11:00
|
|
|
area_split_preview_update_cursor(C, op);
|
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-24 10:45:36 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* function to be called outside UI context, or for redo */
|
|
|
|
static int area_split_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!area_split_init(C, op))
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
area_split_apply(C, op);
|
|
|
|
area_split_exit(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void area_split_cancel(bContext *C, wmOperator *op)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
sAreaSplitData *sd = (sAreaSplitData *)op->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sd->previewmode) {
|
2018-04-16 17:08:27 +02:00
|
|
|
/* pass */
|
2011-03-02 14:09:54 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (screen_area_join(C, CTX_wm_screen(C), sd->sarea, sd->narea)) {
|
|
|
|
if (CTX_wm_area(C) == sd->narea) {
|
|
|
|
CTX_wm_area_set(C, NULL);
|
|
|
|
CTX_wm_region_set(C, NULL);
|
|
|
|
}
|
|
|
|
sd->narea = NULL;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
area_split_exit(C, op);
|
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_split_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
sAreaSplitData *sd = (sAreaSplitData *)op->customdata;
|
2018-01-21 00:39:06 +11:00
|
|
|
PropertyRNA *prop_dir = RNA_struct_find_property(op->ptr, "direction");
|
|
|
|
bool update_factor = false;
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* execute the events */
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (event->type) {
|
2008-11-19 16:28:11 +00:00
|
|
|
case MOUSEMOVE:
|
2018-01-22 23:06:38 -02:00
|
|
|
update_factor = true;
|
2008-11-19 16:28:11 +00:00
|
|
|
break;
|
2018-01-22 23:06:38 -02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
case LEFTMOUSE:
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sd->previewmode) {
|
2011-03-02 14:09:54 +00:00
|
|
|
area_split_apply(C, op);
|
2008-11-19 16:28:11 +00:00
|
|
|
area_split_exit(C, op);
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
2011-03-02 14:09:54 +00:00
|
|
|
else {
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->val == KM_RELEASE) { /* mouse up */
|
2011-03-02 14:09:54 +00:00
|
|
|
area_split_exit(C, op);
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
break;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-12-20 00:46:55 +00:00
|
|
|
case MIDDLEMOUSE:
|
|
|
|
case TABKEY:
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sd->previewmode == 0) {
|
2018-01-21 00:39:06 +11:00
|
|
|
/* pass */
|
2011-12-20 00:46:55 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else {
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->val == KM_PRESS) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sd->sarea) {
|
2018-01-21 00:39:06 +11:00
|
|
|
int dir = RNA_property_enum_get(op->ptr, prop_dir);
|
|
|
|
RNA_property_enum_set(op->ptr, prop_dir, (dir == 'v') ? 'h' : 'v');
|
|
|
|
area_split_preview_update_cursor(C, op);
|
|
|
|
update_factor = true;
|
2011-12-20 00:46:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-12-20 00:46:55 +00:00
|
|
|
break;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
case RIGHTMOUSE: /* cancel operation */
|
|
|
|
case ESCKEY:
|
2013-10-30 23:08:53 +00:00
|
|
|
area_split_cancel(C, op);
|
|
|
|
return OPERATOR_CANCELLED;
|
2018-01-18 11:22:58 +11:00
|
|
|
|
|
|
|
case LEFTCTRLKEY:
|
|
|
|
sd->do_snap = event->val == KM_PRESS;
|
2018-01-21 00:39:06 +11:00
|
|
|
update_factor = true;
|
2018-01-18 11:22:58 +11:00
|
|
|
break;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-01-21 00:39:06 +11:00
|
|
|
|
|
|
|
if (update_factor) {
|
2018-01-22 23:06:38 -02:00
|
|
|
const int dir = RNA_property_enum_get(op->ptr, prop_dir);
|
|
|
|
|
|
|
|
sd->delta = (dir == 'v') ? event->x - sd->origval : event->y - sd->origval;
|
|
|
|
|
|
|
|
if (sd->previewmode == 0) {
|
|
|
|
if (sd->do_snap) {
|
|
|
|
const int snap_loc = area_snap_calc_location(
|
2018-07-13 08:18:18 +02:00
|
|
|
CTX_wm_screen(C), SNAP_FRACTION_AND_ADJACENT, sd->delta, sd->origval, dir,
|
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
|
|
|
sd->bigger, sd->smaller);
|
2018-01-22 23:06:38 -02:00
|
|
|
sd->delta = snap_loc - sd->origval;
|
|
|
|
}
|
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
|
|
|
area_move_apply_do(C, sd->delta, sd->origval, dir, sd->bigger, sd->smaller, SNAP_NONE);
|
2018-01-22 23:06:38 -02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (sd->sarea) {
|
|
|
|
ED_area_tag_redraw(sd->sarea);
|
|
|
|
}
|
|
|
|
/* area context not set */
|
|
|
|
sd->sarea = BKE_screen_find_area_xy(CTX_wm_screen(C), SPACE_TYPE_ANY, event->x, event->y);
|
|
|
|
|
|
|
|
if (sd->sarea) {
|
|
|
|
ScrArea *sa = sd->sarea;
|
|
|
|
if (dir == 'v') {
|
2018-06-02 03:17:51 -03:00
|
|
|
sd->origmin = sa->v1->vec.x;
|
|
|
|
sd->origsize = sa->v4->vec.x - sd->origmin;
|
2018-01-22 23:06:38 -02:00
|
|
|
}
|
|
|
|
else {
|
2018-06-02 03:17:51 -03:00
|
|
|
sd->origmin = sa->v1->vec.y;
|
|
|
|
sd->origsize = sa->v2->vec.y - sd->origmin;
|
2018-01-22 23:06:38 -02:00
|
|
|
}
|
2018-01-21 00:39:06 +11:00
|
|
|
|
2018-01-22 23:06:38 -02:00
|
|
|
if (sd->do_snap) {
|
|
|
|
sa->v1->editflag = sa->v2->editflag = sa->v3->editflag = sa->v4->editflag = 1;
|
|
|
|
|
|
|
|
const int snap_loc = area_snap_calc_location(
|
2018-07-13 08:18:18 +02:00
|
|
|
CTX_wm_screen(C), SNAP_FRACTION_AND_ADJACENT, sd->delta, sd->origval, dir,
|
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
|
|
|
sd->origmin + sd->origsize, -sd->origmin);
|
2018-01-22 23:06:38 -02:00
|
|
|
|
|
|
|
sa->v1->editflag = sa->v2->editflag = sa->v3->editflag = sa->v4->editflag = 0;
|
|
|
|
sd->delta = snap_loc - sd->origval;
|
|
|
|
}
|
|
|
|
|
|
|
|
ED_area_tag_redraw(sd->sarea);
|
|
|
|
}
|
|
|
|
|
2018-01-23 01:00:16 -02:00
|
|
|
CTX_wm_screen(C)->do_draw = true;
|
2018-01-21 00:39:06 +11:00
|
|
|
}
|
2018-01-22 23:06:38 -02:00
|
|
|
|
|
|
|
float fac = (float)(sd->delta + sd->origval - sd->origmin) / sd->origsize;
|
|
|
|
RNA_float_set(op->ptr, "factor", fac);
|
2018-01-21 00:39:06 +11:00
|
|
|
}
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem prop_direction_items[] = {
|
2012-05-08 11:48:19 +00:00
|
|
|
{'h', "HORIZONTAL", 0, "Horizontal", ""},
|
|
|
|
{'v', "VERTICAL", 0, "Vertical", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2012-05-08 11:48:19 +00:00
|
|
|
};
|
2008-12-09 15:59:43 +00:00
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_area_split(wmOperatorType *ot)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-19 09:46:41 +00:00
|
|
|
ot->name = "Split Area";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Split selected area into new windows";
|
2008-12-26 11:11:21 +00:00
|
|
|
ot->idname = "SCREEN_OT_area_split";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = area_split_exec;
|
|
|
|
ot->invoke = area_split_invoke;
|
|
|
|
ot->modal = area_split_modal;
|
|
|
|
ot->cancel = area_split_cancel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = screen_active_editable;
|
2014-02-26 13:48:41 +11:00
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-21 19:14:38 +00:00
|
|
|
/* rna */
|
2009-01-16 23:53:11 +00:00
|
|
|
RNA_def_enum(ot->srna, "direction", prop_direction_items, 'h', "Direction", "");
|
|
|
|
RNA_def_float(ot->srna, "factor", 0.5f, 0.0, 1.0, "Factor", "", 0.0, 1.0);
|
2018-07-02 12:24:21 +02:00
|
|
|
RNA_def_int_vector(ot->srna, "cursor", 2, NULL, INT_MIN, INT_MAX, "Cursor", "", INT_MIN, INT_MAX);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Scale Region Edge Operator
|
|
|
|
* \{ */
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
|
|
|
|
typedef struct RegionMoveData {
|
2009-09-16 17:43:09 +00:00
|
|
|
AZone *az;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
ARegion *ar;
|
2009-09-16 17:43:09 +00:00
|
|
|
ScrArea *sa;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
int bigger, smaller, origval;
|
|
|
|
int origx, origy;
|
2009-12-10 09:25:30 +00:00
|
|
|
int maxsize;
|
2010-09-20 13:13:40 +00:00
|
|
|
AZEdge edge;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
} RegionMoveData;
|
|
|
|
|
2010-09-20 13:13:40 +00:00
|
|
|
static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
|
2009-12-10 09:25:30 +00:00
|
|
|
{
|
|
|
|
ARegion *ar;
|
|
|
|
int dist;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-04-03 14:53:57 +02:00
|
|
|
/* regions in regions. */
|
|
|
|
if (scalear->alignment & RGN_SPLIT_PREV) {
|
|
|
|
const int align = scalear->alignment & RGN_ALIGN_ENUM_MASK;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-04-03 14:53:57 +02:00
|
|
|
if (ELEM(align, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
|
|
|
|
ar = scalear->prev;
|
|
|
|
dist = ar->winy + scalear->winy - U.pixelsize;
|
2012-05-27 11:10:27 +00:00
|
|
|
}
|
2019-04-03 14:53:57 +02:00
|
|
|
else if (ELEM(align, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
|
|
|
|
ar = scalear->prev;
|
|
|
|
dist = ar->winx + scalear->winx - U.pixelsize;
|
2012-05-27 11:10:27 +00:00
|
|
|
}
|
2009-12-10 09:25:30 +00:00
|
|
|
}
|
2019-04-03 14:53:57 +02:00
|
|
|
else {
|
|
|
|
if (edge == AE_RIGHT_TO_TOPLEFT || edge == AE_LEFT_TO_TOPRIGHT) {
|
|
|
|
dist = BLI_rcti_size_x(&sa->totrct);
|
|
|
|
}
|
|
|
|
else { /* AE_BOTTOM_TO_TOPLEFT, AE_TOP_TO_BOTTOMRIGHT */
|
|
|
|
dist = BLI_rcti_size_y(&sa->totrct);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* subtractwidth of regions on opposite side
|
|
|
|
* prevents dragging regions into other opposite regions */
|
|
|
|
for (ar = sa->regionbase.first; ar; ar = ar->next) {
|
|
|
|
if (ar == scalear)
|
|
|
|
continue;
|
2010-06-07 06:50:56 +00:00
|
|
|
|
2019-04-03 14:53:57 +02:00
|
|
|
if (scalear->alignment == RGN_ALIGN_LEFT && ar->alignment == RGN_ALIGN_RIGHT) {
|
|
|
|
dist -= ar->winx;
|
|
|
|
}
|
|
|
|
else if (scalear->alignment == RGN_ALIGN_RIGHT && ar->alignment == RGN_ALIGN_LEFT) {
|
|
|
|
dist -= ar->winx;
|
|
|
|
}
|
|
|
|
else if (scalear->alignment == RGN_ALIGN_TOP &&
|
|
|
|
(ar->alignment == RGN_ALIGN_BOTTOM || ar->regiontype == RGN_TYPE_HEADER)) {
|
|
|
|
dist -= ar->winy;
|
|
|
|
}
|
|
|
|
else if (scalear->alignment == RGN_ALIGN_BOTTOM &&
|
|
|
|
(ar->alignment == RGN_ALIGN_TOP || ar->regiontype == RGN_TYPE_HEADER)) {
|
|
|
|
dist -= ar->winy;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dist /= UI_DPI_FAC;
|
2009-12-10 09:25:30 +00:00
|
|
|
return dist;
|
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int region_scale_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
sActionzoneData *sad = event->customdata;
|
2009-12-10 03:07:04 +00:00
|
|
|
AZone *az;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->type != EVT_ACTIONZONE_REGION) {
|
2012-10-21 05:46:41 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Can only scale region size from an action zone");
|
2009-12-10 03:07:04 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-12-10 03:07:04 +00:00
|
|
|
az = sad->az;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (az->ar) {
|
2012-05-08 11:48:19 +00:00
|
|
|
RegionMoveData *rmd = MEM_callocN(sizeof(RegionMoveData), "RegionMoveData");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = rmd;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
rmd->az = az;
|
2012-05-08 11:48:19 +00:00
|
|
|
rmd->ar = az->ar;
|
2009-09-16 17:43:09 +00:00
|
|
|
rmd->sa = sad->sa1;
|
2012-05-08 11:48:19 +00:00
|
|
|
rmd->edge = az->edge;
|
|
|
|
rmd->origx = event->x;
|
|
|
|
rmd->origy = event->y;
|
2009-12-10 09:25:30 +00:00
|
|
|
rmd->maxsize = area_max_regionsize(rmd->sa, rmd->ar, rmd->edge);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
/* if not set we do now, otherwise it uses type */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (rmd->ar->sizex == 0)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rmd->ar->sizex = rmd->ar->winx;
|
2012-05-08 11:48:19 +00:00
|
|
|
if (rmd->ar->sizey == 0)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rmd->ar->sizey = rmd->ar->winy;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
/* now copy to regionmovedata */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (rmd->edge == AE_LEFT_TO_TOPRIGHT || rmd->edge == AE_RIGHT_TO_TOPLEFT) {
|
|
|
|
rmd->origval = rmd->ar->sizex;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-08 11:48:19 +00:00
|
|
|
rmd->origval = rmd->ar->sizey;
|
2009-12-10 09:25:30 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-04-03 14:53:57 +02:00
|
|
|
CLAMP(rmd->maxsize, 0, 1000);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
/* add temp handler */
|
2009-10-22 23:22:05 +00:00
|
|
|
WM_event_add_modal_handler(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2011-12-23 12:56:48 +00:00
|
|
|
static void region_scale_validate_size(RegionMoveData *rmd)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
if ((rmd->ar->flag & RGN_FLAG_HIDDEN) == 0) {
|
|
|
|
short *size, maxsize = -1;
|
2011-12-23 12:56:48 +00:00
|
|
|
|
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (rmd->edge == AE_LEFT_TO_TOPRIGHT || rmd->edge == AE_RIGHT_TO_TOPLEFT)
|
|
|
|
size = &rmd->ar->sizex;
|
2011-12-23 12:56:48 +00:00
|
|
|
else
|
2012-05-08 11:48:19 +00:00
|
|
|
size = &rmd->ar->sizey;
|
2011-12-23 12:56:48 +00:00
|
|
|
|
2019-04-03 14:53:57 +02:00
|
|
|
maxsize = rmd->maxsize - (UI_UNIT_Y / UI_DPI_FAC);
|
2011-12-23 12:56:48 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (*size > maxsize && maxsize > 0)
|
2012-05-08 11:48:19 +00:00
|
|
|
*size = maxsize;
|
2011-12-23 12:56:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void region_scale_toggle_hidden(bContext *C, RegionMoveData *rmd)
|
|
|
|
{
|
2015-06-29 20:46:23 +10:00
|
|
|
/* hidden areas may have bad 'View2D.cur' value,
|
|
|
|
* correct before displaying. see T45156 */
|
|
|
|
if (rmd->ar->flag & RGN_FLAG_HIDDEN) {
|
|
|
|
UI_view2d_curRect_validate(&rmd->ar->v2d);
|
|
|
|
}
|
|
|
|
|
2012-12-13 12:17:57 +00:00
|
|
|
region_toggle_hidden(C, rmd->ar, 0);
|
2011-12-23 12:56:48 +00:00
|
|
|
region_scale_validate_size(rmd);
|
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int region_scale_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
RegionMoveData *rmd = op->customdata;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
int delta;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
/* execute the events */
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (event->type) {
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
case MOUSEMOVE:
|
2018-04-26 12:01:44 +02:00
|
|
|
{
|
2018-04-27 17:55:17 +02:00
|
|
|
const float aspect = BLI_rctf_size_x(&rmd->ar->v2d.cur) / (BLI_rcti_size_x(&rmd->ar->v2d.mask) + 1);
|
2018-06-12 22:00:22 +02:00
|
|
|
const int snap_size_threshold = (U.widget_unit * 2) / aspect;
|
2012-05-08 11:48:19 +00:00
|
|
|
if (rmd->edge == AE_LEFT_TO_TOPRIGHT || rmd->edge == AE_RIGHT_TO_TOPLEFT) {
|
|
|
|
delta = event->x - rmd->origx;
|
|
|
|
if (rmd->edge == AE_LEFT_TO_TOPRIGHT) delta = -delta;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-12-19 15:44:47 +00:00
|
|
|
/* region sizes now get multiplied */
|
|
|
|
delta /= UI_DPI_FAC;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
rmd->ar->sizex = rmd->origval + delta;
|
2018-04-26 12:01:44 +02:00
|
|
|
|
|
|
|
if (rmd->ar->type->snap_size) {
|
|
|
|
short sizex_test = rmd->ar->type->snap_size(rmd->ar, rmd->ar->sizex, 0);
|
|
|
|
if (ABS(rmd->ar->sizex - sizex_test) < snap_size_threshold) {
|
|
|
|
rmd->ar->sizex = sizex_test;
|
|
|
|
}
|
|
|
|
}
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
CLAMP(rmd->ar->sizex, 0, rmd->maxsize);
|
2018-04-26 12:01:44 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (rmd->ar->sizex < UI_UNIT_X) {
|
2012-05-08 11:48:19 +00:00
|
|
|
rmd->ar->sizex = rmd->origval;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(rmd->ar->flag & RGN_FLAG_HIDDEN))
|
2011-12-23 12:56:48 +00:00
|
|
|
region_scale_toggle_hidden(C, rmd);
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
2019-01-04 21:40:16 +01:00
|
|
|
else if (rmd->ar->flag & RGN_FLAG_HIDDEN) {
|
2011-12-23 12:56:48 +00:00
|
|
|
region_scale_toggle_hidden(C, rmd);
|
2019-01-04 21:40:16 +01:00
|
|
|
}
|
|
|
|
else if (rmd->ar->flag & RGN_FLAG_DYNAMIC_SIZE) {
|
|
|
|
rmd->ar->sizex = rmd->origval;
|
|
|
|
}
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-08 11:48:19 +00:00
|
|
|
delta = event->y - rmd->origy;
|
|
|
|
if (rmd->edge == AE_BOTTOM_TO_TOPLEFT) delta = -delta;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-12-19 15:44:47 +00:00
|
|
|
/* region sizes now get multiplied */
|
|
|
|
delta /= UI_DPI_FAC;
|
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
rmd->ar->sizey = rmd->origval + delta;
|
2018-04-26 12:01:44 +02:00
|
|
|
|
|
|
|
if (rmd->ar->type->snap_size) {
|
|
|
|
short sizey_test = rmd->ar->type->snap_size(rmd->ar, rmd->ar->sizey, 1);
|
|
|
|
if (ABS(rmd->ar->sizey - sizey_test) < snap_size_threshold) {
|
|
|
|
rmd->ar->sizey = sizey_test;
|
|
|
|
}
|
|
|
|
}
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
CLAMP(rmd->ar->sizey, 0, rmd->maxsize);
|
2010-09-17 23:50:10 +00:00
|
|
|
|
2011-06-05 09:00:36 +00:00
|
|
|
/* note, 'UI_UNIT_Y/4' means you need to drag the header almost
|
|
|
|
* all the way down for it to become hidden, this is done
|
|
|
|
* otherwise its too easy to do this by accident */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (rmd->ar->sizey < UI_UNIT_Y / 4) {
|
|
|
|
rmd->ar->sizey = rmd->origval;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(rmd->ar->flag & RGN_FLAG_HIDDEN))
|
2011-12-23 12:56:48 +00:00
|
|
|
region_scale_toggle_hidden(C, rmd);
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
2019-01-04 21:40:16 +01:00
|
|
|
else if (rmd->ar->flag & RGN_FLAG_HIDDEN) {
|
2011-12-23 12:56:48 +00:00
|
|
|
region_scale_toggle_hidden(C, rmd);
|
2019-01-04 21:40:16 +01:00
|
|
|
}
|
|
|
|
else if (rmd->ar->flag & RGN_FLAG_DYNAMIC_SIZE) {
|
|
|
|
rmd->ar->sizey = rmd->origval;
|
|
|
|
}
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
2010-01-16 22:56:52 +00:00
|
|
|
ED_area_tag_redraw(rmd->sa);
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
break;
|
2018-04-26 12:01:44 +02:00
|
|
|
}
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
case LEFTMOUSE:
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->val == KM_RELEASE) {
|
2019-03-20 22:14:13 +11:00
|
|
|
if (len_manhattan_v2v2_int(&event->x, &rmd->origx) <= WM_EVENT_CURSOR_MOTION_THRESHOLD) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (rmd->ar->flag & RGN_FLAG_HIDDEN) {
|
2011-12-23 12:56:48 +00:00
|
|
|
region_scale_toggle_hidden(C, rmd);
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (rmd->ar->flag & RGN_FLAG_TOO_SMALL) {
|
2011-12-23 12:56:48 +00:00
|
|
|
region_scale_validate_size(rmd);
|
2009-10-22 23:22:05 +00:00
|
|
|
}
|
2011-12-23 12:56:48 +00:00
|
|
|
|
|
|
|
ED_area_tag_redraw(rmd->sa);
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2009-10-22 23:22:05 +00:00
|
|
|
}
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
MEM_freeN(op->customdata);
|
|
|
|
op->customdata = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
break;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
case ESCKEY:
|
2012-10-21 07:58:38 +00:00
|
|
|
break;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void region_scale_cancel(bContext *UNUSED(C), wmOperator *op)
|
2011-06-06 11:04:54 +00:00
|
|
|
{
|
|
|
|
MEM_freeN(op->customdata);
|
|
|
|
op->customdata = NULL;
|
|
|
|
}
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
|
|
|
|
static void SCREEN_OT_region_scale(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Scale Region Size";
|
|
|
|
ot->description = "Scale selected area";
|
|
|
|
ot->idname = "SCREEN_OT_region_scale";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = region_scale_invoke;
|
|
|
|
ot->modal = region_scale_modal;
|
|
|
|
ot->cancel = region_scale_cancel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_areaactive;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-02-26 13:48:41 +11:00
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Frame Change Operator
|
|
|
|
* \{ */
|
2008-12-17 16:21:14 +00:00
|
|
|
|
2015-02-12 23:51:02 +11:00
|
|
|
static void areas_do_frame_follow(bContext *C, bool middle)
|
|
|
|
{
|
2015-02-12 13:08:22 +01:00
|
|
|
bScreen *scr = CTX_wm_screen(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
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
|
|
|
for (wmWindow *window = wm->windows.first; window; window = window->next) {
|
|
|
|
const bScreen *screen = WM_window_get_active_screen(window);
|
|
|
|
|
|
|
|
for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
|
|
|
|
for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
|
2015-02-12 13:08:22 +01:00
|
|
|
/* do follow here if editor type supports it */
|
|
|
|
if ((scr->redraws_flag & TIME_FOLLOW)) {
|
|
|
|
if ((ar->regiontype == RGN_TYPE_WINDOW &&
|
2019-02-16 16:42:11 +11:00
|
|
|
ELEM(sa->spacetype, SPACE_SEQ, SPACE_GRAPH, SPACE_ACTION, SPACE_NLA)) ||
|
2015-02-12 23:51:02 +11:00
|
|
|
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
2015-02-12 13:08:22 +01:00
|
|
|
{
|
|
|
|
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
|
|
|
|
|
|
|
if (middle) {
|
2015-02-12 23:51:02 +11:00
|
|
|
if ((scene->r.cfra < ar->v2d.cur.xmin) || (scene->r.cfra > ar->v2d.cur.xmax)) {
|
|
|
|
ar->v2d.cur.xmax = scene->r.cfra + (w / 2);
|
|
|
|
ar->v2d.cur.xmin = scene->r.cfra - (w / 2);
|
2015-02-12 13:08:22 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (scene->r.cfra < ar->v2d.cur.xmin) {
|
|
|
|
ar->v2d.cur.xmax = scene->r.cfra;
|
|
|
|
ar->v2d.cur.xmin = ar->v2d.cur.xmax - w;
|
|
|
|
}
|
|
|
|
else if (scene->r.cfra > ar->v2d.cur.xmax) {
|
|
|
|
ar->v2d.cur.xmin = scene->r.cfra;
|
|
|
|
ar->v2d.cur.xmax = ar->v2d.cur.xmin + w;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-17 16:21:14 +00:00
|
|
|
/* function to be called outside UI context, or for redo */
|
|
|
|
static int frame_offset_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2008-12-17 16:21:14 +00:00
|
|
|
int delta;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-17 16:21:14 +00:00
|
|
|
delta = RNA_int_get(op->ptr, "delta");
|
2010-02-07 23:41:17 +00:00
|
|
|
|
2012-02-12 11:42:17 +00:00
|
|
|
CFRA += delta;
|
|
|
|
FRAMENUMBER_MIN_CLAMP(CFRA);
|
|
|
|
SUBFRA = 0.f;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2015-02-12 13:08:22 +01:00
|
|
|
areas_do_frame_follow(C, false);
|
|
|
|
|
2015-03-26 11:35:41 +01:00
|
|
|
BKE_sound_seek_scene(bmain, scene);
|
2010-02-07 23:41:17 +00:00
|
|
|
|
2014-04-30 07:48:54 +10:00
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-17 16:21:14 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_frame_offset(wmOperatorType *ot)
|
2008-12-17 16:21:14 +00:00
|
|
|
{
|
|
|
|
ot->name = "Frame Offset";
|
2008-12-26 11:11:21 +00:00
|
|
|
ot->idname = "SCREEN_OT_frame_offset";
|
2012-05-06 15:03:31 +00:00
|
|
|
ot->description = "Move current frame forward/backward by a given number";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = frame_offset_exec;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive_norender;
|
Implement grouped undo option for operators
This option makes an operator to not push a task to the undo stack if the previous stored elemen is the same operator or part of the same undo group.
The main usage is for animation, so you can change frames to inspect the
poses, and revert the previous pose without having to roll back tons of
"change frame" operator, or even see the undo stack full.
This complements rB13ee9b8e
Design with help by Sergey Sharybin.
Reviewers: sergey, mont29
Reviewed By: mont29, sergey
Subscribers: pyc0d3r, hjalti, Severin, lowercase, brecht, monio, aligorith, hadrien, jbakker
Differential Revision: https://developer.blender.org/D2330
2016-11-15 11:50:11 +01:00
|
|
|
ot->flag = OPTYPE_UNDO_GROUPED;
|
2018-06-13 18:38:38 +02:00
|
|
|
ot->undo_group = "Frame Change";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-17 16:21:14 +00:00
|
|
|
/* rna */
|
2009-01-16 23:53:11 +00:00
|
|
|
RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
|
2008-12-17 16:21:14 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Frame Jump Operator
|
|
|
|
* \{ */
|
2009-08-02 07:08:51 +00:00
|
|
|
|
|
|
|
/* function to be called outside UI context, or for redo */
|
|
|
|
static int frame_jump_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
wmTimer *animtimer = CTX_wm_screen(C)->animtimer;
|
2010-10-11 10:40:34 +00:00
|
|
|
|
|
|
|
/* Don't change CFRA directly if animtimer is running as this can cause
|
|
|
|
* first/last frame not to be actually shown (bad since for example physics
|
|
|
|
* simulations aren't reset properly).
|
|
|
|
*/
|
2012-03-24 06:38:07 +00:00
|
|
|
if (animtimer) {
|
2010-10-11 10:40:34 +00:00
|
|
|
ScreenAnimData *sad = animtimer->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-10-11 10:40:34 +00:00
|
|
|
sad->flag |= ANIMPLAY_FLAG_USE_NEXT_FRAME;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-10-11 10:40:34 +00:00
|
|
|
if (RNA_boolean_get(op->ptr, "end"))
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->nextfra = PEFRA;
|
2010-10-11 10:40:34 +00:00
|
|
|
else
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->nextfra = PSFRA;
|
2010-10-11 10:40:34 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (RNA_boolean_get(op->ptr, "end"))
|
2012-05-08 11:48:19 +00:00
|
|
|
CFRA = PEFRA;
|
2010-10-11 10:40:34 +00:00
|
|
|
else
|
2012-05-08 11:48:19 +00:00
|
|
|
CFRA = PSFRA;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2015-02-12 13:08:22 +01:00
|
|
|
areas_do_frame_follow(C, true);
|
|
|
|
|
2015-03-26 11:35:41 +01:00
|
|
|
BKE_sound_seek_scene(bmain, scene);
|
2010-02-10 23:15:12 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
|
2010-10-11 10:40:34 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-08-02 07:08:51 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_frame_jump(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "Jump to Endpoint";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Jump to first/last frame in frame range";
|
2009-08-02 07:08:51 +00:00
|
|
|
ot->idname = "SCREEN_OT_frame_jump";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = frame_jump_exec;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive_norender;
|
Implement grouped undo option for operators
This option makes an operator to not push a task to the undo stack if the previous stored elemen is the same operator or part of the same undo group.
The main usage is for animation, so you can change frames to inspect the
poses, and revert the previous pose without having to roll back tons of
"change frame" operator, or even see the undo stack full.
This complements rB13ee9b8e
Design with help by Sergey Sharybin.
Reviewers: sergey, mont29
Reviewed By: mont29, sergey
Subscribers: pyc0d3r, hjalti, Severin, lowercase, brecht, monio, aligorith, hadrien, jbakker
Differential Revision: https://developer.blender.org/D2330
2016-11-15 11:50:11 +01:00
|
|
|
ot->flag = OPTYPE_UNDO_GROUPED;
|
2018-06-13 18:38:38 +02:00
|
|
|
ot->undo_group = "Frame Change";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-08-02 07:08:51 +00:00
|
|
|
/* rna */
|
2011-09-19 12:26:20 +00:00
|
|
|
RNA_def_boolean(ot->srna, "end", 0, "Last Frame", "Jump to the last frame of the frame range");
|
2009-08-02 07:08:51 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2009-08-02 07:08:51 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Jump to Key-Frame Operator
|
|
|
|
* \{ */
|
2009-07-24 13:34:45 +00:00
|
|
|
|
|
|
|
/* function to be called outside UI context, or for redo */
|
|
|
|
static int keyframe_jump_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
Object *ob = CTX_data_active_object(C);
|
|
|
|
bDopeSheet ads = {NULL};
|
2009-07-24 13:34:45 +00:00
|
|
|
DLRBT_Tree keys;
|
|
|
|
ActKeyColumn *ak;
|
2011-05-01 10:14:09 +00:00
|
|
|
float cfra;
|
2014-02-03 18:55:59 +11:00
|
|
|
const bool next = RNA_boolean_get(op->ptr, "next");
|
|
|
|
bool done = false;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-07-24 13:34:45 +00:00
|
|
|
/* sanity checks */
|
|
|
|
if (scene == NULL)
|
|
|
|
return OPERATOR_CANCELLED;
|
2011-05-01 10:14:09 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
cfra = (float)(CFRA);
|
2011-05-01 10:14:09 +00:00
|
|
|
|
2009-07-24 13:34:45 +00:00
|
|
|
/* init binarytree-list for getting keyframes */
|
|
|
|
BLI_dlrbTree_init(&keys);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-04-26 03:36:34 +12:00
|
|
|
/* seed up dummy dopesheet context with flags to perform necessary filtering */
|
|
|
|
if ((scene->flag & SCE_KEYS_NO_SELONLY) == 0) {
|
|
|
|
/* only selected channels are included */
|
|
|
|
ads.filterflag |= ADS_FILTER_ONLYSEL;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-07-24 13:34:45 +00:00
|
|
|
/* populate tree with keyframe nodes */
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
scene_to_keylist(&ads, scene, &keys, 0);
|
2011-05-01 10:14:09 +00:00
|
|
|
|
2015-12-13 21:03:13 +13:00
|
|
|
if (ob) {
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
ob_to_keylist(&ads, ob, &keys, 0);
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
if (ob->type == OB_GPENCIL) {
|
|
|
|
const bool active = !(scene->flag & SCE_KEYS_NO_SELONLY);
|
|
|
|
gpencil_to_keylist(&ads, ob->data, &keys, active);
|
|
|
|
}
|
2015-12-13 21:03:13 +13:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-06-04 16:42:58 +00:00
|
|
|
{
|
2012-07-27 10:55:24 +00:00
|
|
|
Mask *mask = CTX_data_edit_mask(C);
|
|
|
|
if (mask) {
|
|
|
|
MaskLayer *masklay = BKE_mask_layer_active(mask);
|
|
|
|
mask_to_keylist(&ads, masklay, &keys);
|
2012-06-04 16:42:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-15 11:20:44 +00:00
|
|
|
/* find matching keyframe in the right direction */
|
2017-07-17 02:24:45 +12:00
|
|
|
if (next)
|
|
|
|
ak = (ActKeyColumn *)BLI_dlrbTree_search_next(&keys, compare_ak_cfraPtr, &cfra);
|
|
|
|
else
|
|
|
|
ak = (ActKeyColumn *)BLI_dlrbTree_search_prev(&keys, compare_ak_cfraPtr, &cfra);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2017-07-17 02:24:45 +12:00
|
|
|
while ((ak != NULL) && (done == false)) {
|
|
|
|
if (CFRA != (int)ak->cfra) {
|
|
|
|
/* this changes the frame, so set the frame and we're done */
|
|
|
|
CFRA = (int)ak->cfra;
|
|
|
|
done = true;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* take another step... */
|
|
|
|
if (next) {
|
|
|
|
ak = ak->next;
|
2010-06-08 00:08:45 +00:00
|
|
|
}
|
|
|
|
else {
|
2017-07-17 02:24:45 +12:00
|
|
|
ak = ak->prev;
|
2010-06-08 00:08:45 +00:00
|
|
|
}
|
|
|
|
}
|
2017-07-17 02:24:45 +12:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-07-24 13:34:45 +00:00
|
|
|
/* free temp stuff */
|
|
|
|
BLI_dlrbTree_free(&keys);
|
2010-02-10 23:15:12 +00:00
|
|
|
|
2012-05-27 11:22:06 +00:00
|
|
|
/* any success? */
|
2014-04-01 11:34:00 +11:00
|
|
|
if (done == false) {
|
2012-05-27 11:22:06 +00:00
|
|
|
BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction");
|
|
|
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
else {
|
2015-02-12 13:08:22 +01:00
|
|
|
areas_do_frame_follow(C, true);
|
|
|
|
|
2015-03-26 11:35:41 +01:00
|
|
|
BKE_sound_seek_scene(bmain, scene);
|
2012-05-27 11:22:06 +00:00
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
2009-07-24 13:34:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_keyframe_jump(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "Jump to Keyframe";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Jump to previous/next keyframe";
|
2009-07-24 13:34:45 +00:00
|
|
|
ot->idname = "SCREEN_OT_keyframe_jump";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = keyframe_jump_exec;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive_norender;
|
Implement grouped undo option for operators
This option makes an operator to not push a task to the undo stack if the previous stored elemen is the same operator or part of the same undo group.
The main usage is for animation, so you can change frames to inspect the
poses, and revert the previous pose without having to roll back tons of
"change frame" operator, or even see the undo stack full.
This complements rB13ee9b8e
Design with help by Sergey Sharybin.
Reviewers: sergey, mont29
Reviewed By: mont29, sergey
Subscribers: pyc0d3r, hjalti, Severin, lowercase, brecht, monio, aligorith, hadrien, jbakker
Differential Revision: https://developer.blender.org/D2330
2016-11-15 11:50:11 +01:00
|
|
|
ot->flag = OPTYPE_UNDO_GROUPED;
|
2018-06-13 18:38:38 +02:00
|
|
|
ot->undo_group = "Frame Change";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-08-23 07:39:51 +00:00
|
|
|
/* properties */
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_def_boolean(ot->srna, "next", true, "Next Keyframe", "");
|
2009-07-24 13:34:45 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Jump to Marker Operator
|
|
|
|
* \{ */
|
2013-10-21 15:00:22 +00:00
|
|
|
|
|
|
|
/* function to be called outside UI context, or for redo */
|
|
|
|
static int marker_jump_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
TimeMarker *marker;
|
2014-01-10 01:01:23 +13:00
|
|
|
int closest = CFRA;
|
2014-02-03 18:55:59 +11:00
|
|
|
const bool next = RNA_boolean_get(op->ptr, "next");
|
2013-10-21 15:00:22 +00:00
|
|
|
bool found = false;
|
|
|
|
|
|
|
|
/* find matching marker in the right direction */
|
|
|
|
for (marker = scene->markers.first; marker; marker = marker->next) {
|
|
|
|
if (next) {
|
2014-01-10 01:01:23 +13:00
|
|
|
if ((marker->frame > CFRA) && (!found || closest > marker->frame)) {
|
2013-10-21 15:00:22 +00:00
|
|
|
closest = marker->frame;
|
|
|
|
found = true;
|
|
|
|
}
|
2013-10-21 23:35:08 +00:00
|
|
|
}
|
|
|
|
else {
|
2014-01-10 01:01:23 +13:00
|
|
|
if ((marker->frame < CFRA) && (!found || closest < marker->frame)) {
|
2013-10-21 15:00:22 +00:00
|
|
|
closest = marker->frame;
|
|
|
|
found = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* any success? */
|
|
|
|
if (!found) {
|
|
|
|
BKE_report(op->reports, RPT_INFO, "No more markers to jump to in this direction");
|
|
|
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
CFRA = closest;
|
|
|
|
|
2015-02-12 13:08:22 +01:00
|
|
|
areas_do_frame_follow(C, true);
|
|
|
|
|
2015-03-26 11:35:41 +01:00
|
|
|
BKE_sound_seek_scene(bmain, scene);
|
2013-10-21 15:00:22 +00:00
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_marker_jump(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "Jump to Marker";
|
|
|
|
ot->description = "Jump to previous/next marker";
|
|
|
|
ot->idname = "SCREEN_OT_marker_jump";
|
|
|
|
|
|
|
|
ot->exec = marker_jump_exec;
|
|
|
|
|
|
|
|
ot->poll = ED_operator_screenactive_norender;
|
Implement grouped undo option for operators
This option makes an operator to not push a task to the undo stack if the previous stored elemen is the same operator or part of the same undo group.
The main usage is for animation, so you can change frames to inspect the
poses, and revert the previous pose without having to roll back tons of
"change frame" operator, or even see the undo stack full.
This complements rB13ee9b8e
Design with help by Sergey Sharybin.
Reviewers: sergey, mont29
Reviewed By: mont29, sergey
Subscribers: pyc0d3r, hjalti, Severin, lowercase, brecht, monio, aligorith, hadrien, jbakker
Differential Revision: https://developer.blender.org/D2330
2016-11-15 11:50:11 +01:00
|
|
|
ot->flag = OPTYPE_UNDO_GROUPED;
|
2018-06-13 18:38:38 +02:00
|
|
|
ot->undo_group = "Frame Change";
|
2013-10-21 15:00:22 +00:00
|
|
|
|
|
|
|
/* properties */
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_def_boolean(ot->srna, "next", true, "Next Marker", "");
|
2013-10-21 15:00:22 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Set Screen Operator
|
|
|
|
* \{ */
|
2008-12-17 17:33:45 +00:00
|
|
|
|
|
|
|
/* function to be called outside UI context, or for redo */
|
|
|
|
static int screen_set_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
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
|
|
|
WorkSpace *workspace = CTX_wm_workspace(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
int delta = RNA_int_get(op->ptr, "delta");
|
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
|
|
|
|
|
|
|
if (ED_workspace_layout_cycle(workspace, delta, C)) {
|
2008-12-17 17:33:45 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
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
|
|
|
|
2008-12-17 17:33:45 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_screen_set(wmOperatorType *ot)
|
2008-12-17 17:33:45 +00:00
|
|
|
{
|
|
|
|
ot->name = "Set Screen";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Cycle through available screens";
|
2008-12-26 11:11:21 +00:00
|
|
|
ot->idname = "SCREEN_OT_screen_set";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = screen_set_exec;
|
|
|
|
ot->poll = ED_operator_screenactive;
|
2014-02-26 13:48:41 +11:00
|
|
|
|
2008-12-17 17:33:45 +00:00
|
|
|
/* rna */
|
2009-01-16 23:53:11 +00:00
|
|
|
RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
|
2008-12-17 17:33:45 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2008-12-17 19:40:19 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Screen Full-Area Operator
|
|
|
|
* \{ */
|
2008-12-17 19:40:19 +00:00
|
|
|
|
|
|
|
/* function to be called outside UI context, or for redo */
|
2014-10-14 15:05:44 -03:00
|
|
|
static int screen_maximize_area_exec(bContext *C, wmOperator *op)
|
2008-12-17 19:40:19 +00:00
|
|
|
{
|
2011-04-02 14:11:13 +00:00
|
|
|
bScreen *screen = CTX_wm_screen(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
ScrArea *sa = NULL;
|
2014-10-14 15:05:44 -03:00
|
|
|
const bool hide_panels = RNA_boolean_get(op->ptr, "use_hide_panels");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-04-02 14:11:13 +00:00
|
|
|
/* search current screen for 'fullscreen' areas */
|
|
|
|
/* prevents restoring info header, when mouse is over it */
|
2012-05-08 11:48:19 +00:00
|
|
|
for (sa = screen->areabase.first; sa; sa = sa->next) {
|
2011-04-02 14:11:13 +00:00
|
|
|
if (sa->full) break;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-14 15:05:44 -03:00
|
|
|
if (sa == NULL) {
|
|
|
|
sa = CTX_wm_area(C);
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-14 15:05:44 -03:00
|
|
|
if (hide_panels) {
|
|
|
|
if (!ELEM(screen->state, SCREENNORMAL, SCREENFULL)) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
ED_screen_state_toggle(C, CTX_wm_window(C), sa, SCREENFULL);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (!ELEM(screen->state, SCREENNORMAL, SCREENMAXIMIZED)) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
ED_screen_state_toggle(C, CTX_wm_window(C), sa, SCREENMAXIMIZED);
|
|
|
|
}
|
|
|
|
|
2008-12-17 19:40:19 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2018-07-02 12:03:56 +02:00
|
|
|
static bool screen_maximize_area_poll(bContext *C)
|
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 bScreen *screen = CTX_wm_screen(C);
|
|
|
|
const ScrArea *area = CTX_wm_area(C);
|
|
|
|
return ED_operator_areaactive(C) &&
|
2018-05-23 22:38:25 +02:00
|
|
|
/* Don't allow maximizing global areas but allow minimizing from them. */
|
|
|
|
((screen->state != SCREENNORMAL) || !ED_area_is_global(area));
|
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
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_screen_full_area(wmOperatorType *ot)
|
2008-12-17 19:40:19 +00:00
|
|
|
{
|
2014-10-14 15:05:44 -03:00
|
|
|
PropertyRNA *prop;
|
|
|
|
|
2016-06-22 07:41:25 +10:00
|
|
|
ot->name = "Toggle Maximize Area";
|
2014-10-14 15:05:44 -03:00
|
|
|
ot->description = "Toggle display selected area as fullscreen/maximized";
|
2008-12-26 11:11:21 +00:00
|
|
|
ot->idname = "SCREEN_OT_screen_full_area";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-14 15:05:44 -03:00
|
|
|
ot->exec = screen_maximize_area_exec;
|
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
|
|
|
ot->poll = screen_maximize_area_poll;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = 0;
|
2008-12-17 17:33:45 +00:00
|
|
|
|
2014-10-14 15:05:44 -03:00
|
|
|
prop = RNA_def_boolean(ot->srna, "use_hide_panels", false, "Hide Panels", "Hide all the panels");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
|
|
|
}
|
2008-12-17 17:33:45 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Screen Join-Area Operator
|
|
|
|
* \{ */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-06-04 09:31:30 +02:00
|
|
|
/* operator state vars used:
|
2012-03-03 16:31:46 +00:00
|
|
|
* x1, y1 mouse coord in first area, which will disappear
|
|
|
|
* x2, y2 mouse coord in 2nd area, which will become joined
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* functions:
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
|
|
|
* init() find edge based on state vars
|
|
|
|
* test if the edge divides two areas,
|
2012-03-03 16:31:46 +00:00
|
|
|
* store active and nonactive area,
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* apply() do the actual join
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* exit() cleanup, send notifier
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* callbacks:
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
|
|
|
* exec() calls init, apply, exit
|
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* invoke() sets mouse coords in x,y
|
|
|
|
* call init()
|
|
|
|
* add modal handler
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* modal() accept modal events while doing it
|
|
|
|
* call apply() with active window and nonactive window
|
|
|
|
* call exit() and remove handler when LMB confirm
|
2009-12-10 09:25:30 +00:00
|
|
|
*/
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
typedef struct sAreaJoinData {
|
2018-01-19 17:14:27 +11:00
|
|
|
ScrArea *sa1; /* first area to be considered */
|
|
|
|
ScrArea *sa2; /* second area to be considered */
|
|
|
|
void *draw_callback; /* call `ED_screen_draw_join_shape` */
|
2011-08-25 15:49:52 +00:00
|
|
|
|
|
|
|
} sAreaJoinData;
|
2008-11-19 16:28:11 +00:00
|
|
|
|
|
|
|
|
2018-01-19 17:14:27 +11:00
|
|
|
static void area_join_draw_cb(const struct wmWindow *UNUSED(win), void *userdata)
|
|
|
|
{
|
|
|
|
const wmOperator *op = userdata;
|
|
|
|
|
|
|
|
sAreaJoinData *sd = op->customdata;
|
|
|
|
if (sd->sa1 && sd->sa2) {
|
|
|
|
ED_screen_draw_join_shape(sd->sa1, sd->sa2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* validate selection inside screen, set variables OK */
|
|
|
|
/* return 0: init failed */
|
|
|
|
/* XXX todo: find edge based on (x,y) and set other area? */
|
|
|
|
static int area_join_init(bContext *C, wmOperator *op)
|
|
|
|
{
|
2018-07-02 16:48:18 +02:00
|
|
|
const wmWindow *win = CTX_wm_window(C);
|
|
|
|
bScreen *screen = CTX_wm_screen(C);
|
2008-11-19 16:28:11 +00:00
|
|
|
ScrArea *sa1, *sa2;
|
2012-05-08 11:48:19 +00:00
|
|
|
sAreaJoinData *jd = NULL;
|
2008-11-19 16:28:11 +00:00
|
|
|
int x1, y1;
|
|
|
|
int x2, y2;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* required properties, make negative to get return 0 if not set by caller */
|
2012-05-08 11:48:19 +00:00
|
|
|
x1 = RNA_int_get(op->ptr, "min_x");
|
|
|
|
y1 = RNA_int_get(op->ptr, "min_y");
|
|
|
|
x2 = RNA_int_get(op->ptr, "max_x");
|
|
|
|
y2 = RNA_int_get(op->ptr, "max_y");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-07-02 16:48:18 +02:00
|
|
|
sa1 = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, x1, y1);
|
|
|
|
if (sa1 == NULL) {
|
|
|
|
sa1 = BKE_screen_area_map_find_area_xy(&win->global_areas, SPACE_TYPE_ANY, x1, y1);
|
|
|
|
}
|
|
|
|
sa2 = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, x2, y2);
|
|
|
|
if (sa2 == NULL) {
|
|
|
|
sa2 = BKE_screen_area_map_find_area_xy(&win->global_areas, SPACE_TYPE_ANY, x2, y2);
|
|
|
|
}
|
|
|
|
if ((sa1 && ED_area_is_global(sa1)) || (sa2 && ED_area_is_global(sa2))) {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Global areas (Top Bar, Status Bar) do not support joining");
|
2008-11-19 16:28:11 +00:00
|
|
|
return 0;
|
2018-07-02 16:48:18 +02:00
|
|
|
}
|
|
|
|
else if (sa1 == NULL || sa2 == NULL || sa1 == sa2) {
|
2008-11-19 16:28:11 +00:00
|
|
|
return 0;
|
2018-07-02 16:48:18 +02:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-06-17 09:58:26 +00:00
|
|
|
jd = (sAreaJoinData *)MEM_callocN(sizeof(sAreaJoinData), "op_area_join");
|
2018-01-19 17:14:27 +11:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
jd->sa1 = sa1;
|
|
|
|
jd->sa2 = sa2;
|
2018-01-19 17:14:27 +11:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
op->customdata = jd;
|
2018-01-19 17:14:27 +11:00
|
|
|
|
|
|
|
jd->draw_callback = WM_draw_cb_activate(CTX_wm_window(C), area_join_draw_cb, op);
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* apply the join of the areas (space types) */
|
|
|
|
static int area_join_apply(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
sAreaJoinData *jd = (sAreaJoinData *)op->customdata;
|
|
|
|
if (!jd) return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!screen_area_join(C, CTX_wm_screen(C), jd->sa1, jd->sa2)) {
|
2008-11-19 16:28:11 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-12-18 02:56:48 +00:00
|
|
|
if (CTX_wm_area(C) == jd->sa2) {
|
|
|
|
CTX_wm_area_set(C, NULL);
|
2008-12-18 19:41:36 +00:00
|
|
|
CTX_wm_region_set(C, NULL);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* finish operation */
|
|
|
|
static void area_join_exit(bContext *C, wmOperator *op)
|
|
|
|
{
|
2018-01-19 17:14:27 +11:00
|
|
|
sAreaJoinData *jd = (sAreaJoinData *)op->customdata;
|
|
|
|
|
|
|
|
if (jd) {
|
|
|
|
if (jd->draw_callback)
|
|
|
|
WM_draw_cb_exit(CTX_wm_window(C), jd->draw_callback);
|
|
|
|
|
|
|
|
MEM_freeN(jd);
|
2008-11-19 16:28:11 +00:00
|
|
|
op->customdata = NULL;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* this makes sure aligned edges will result in aligned grabbing */
|
2018-04-13 21:43:57 +02:00
|
|
|
BKE_screen_remove_double_scredges(CTX_wm_screen(C));
|
|
|
|
BKE_screen_remove_unused_scredges(CTX_wm_screen(C));
|
|
|
|
BKE_screen_remove_unused_scrverts(CTX_wm_screen(C));
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int area_join_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2018-06-04 09:31:30 +02:00
|
|
|
if (!area_join_init(C, op))
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
area_join_apply(C, op);
|
|
|
|
area_join_exit(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* interaction callback */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_join_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->type == EVT_ACTIONZONE_AREA) {
|
|
|
|
sActionzoneData *sad = event->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-09-14 06:17:14 +00:00
|
|
|
if (sad == NULL || sad->modifier > 0) {
|
2009-03-05 23:19:44 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* verify *sad itself */
|
2012-09-14 06:17:14 +00:00
|
|
|
if (sad->sa1 == NULL || sad->sa2 == NULL)
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* is this our *sad? if areas equal it should be passed on */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sad->sa1 == sad->sa2)
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* prepare operator state vars */
|
2019-02-21 17:04:20 +01:00
|
|
|
RNA_int_set(op->ptr, "min_x", sad->sa1->totrct.xmin);
|
|
|
|
RNA_int_set(op->ptr, "min_y", sad->sa1->totrct.ymin);
|
|
|
|
RNA_int_set(op->ptr, "max_x", sad->sa2->totrct.xmin);
|
|
|
|
RNA_int_set(op->ptr, "max_y", sad->sa2->totrct.ymin);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
|
|
|
|
|
|
|
if (!area_join_init(C, op))
|
2018-07-02 16:48:18 +02:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
/* add temp handler */
|
|
|
|
WM_event_add_modal_handler(C, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void area_join_cancel(bContext *C, wmOperator *op)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2008-12-27 16:09:56 +00:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
area_join_exit(C, op);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* modal callback while selecting area (space) that will be removed */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int area_join_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
2019-02-21 17:22:51 +01:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2008-11-19 16:28:11 +00:00
|
|
|
sAreaJoinData *jd = (sAreaJoinData *)op->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* execute the events */
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (event->type) {
|
2018-06-04 09:31:30 +02:00
|
|
|
|
|
|
|
case MOUSEMOVE:
|
2009-12-10 09:25:30 +00:00
|
|
|
{
|
2015-01-21 13:43:46 +11:00
|
|
|
ScrArea *sa = BKE_screen_find_area_xy(sc, SPACE_TYPE_ANY, event->x, event->y);
|
2019-02-21 17:22:51 +01:00
|
|
|
int dir = -1;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-10-21 05:46:41 +00:00
|
|
|
if (sa) {
|
2009-12-10 09:25:30 +00:00
|
|
|
if (jd->sa1 != sa) {
|
2010-10-14 12:24:08 +00:00
|
|
|
dir = area_getorientation(jd->sa1, sa);
|
2014-02-03 18:59:36 +11:00
|
|
|
if (dir != -1) {
|
2009-12-10 09:25:30 +00:00
|
|
|
jd->sa2 = sa;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
else {
|
2018-06-04 09:31:30 +02:00
|
|
|
/* we are not bordering on the previously selected area
|
2012-03-03 16:31:46 +00:00
|
|
|
* we check if area has common border with the one marked for removal
|
|
|
|
* in this case we can swap areas.
|
2009-12-10 09:25:30 +00:00
|
|
|
*/
|
2010-10-14 12:24:08 +00:00
|
|
|
dir = area_getorientation(sa, jd->sa2);
|
2014-02-03 18:59:36 +11:00
|
|
|
if (dir != -1) {
|
2008-11-19 16:28:11 +00:00
|
|
|
jd->sa1 = jd->sa2;
|
|
|
|
jd->sa2 = sa;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
else {
|
2009-12-10 09:25:30 +00:00
|
|
|
jd->sa2 = NULL;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
2009-12-10 09:25:30 +00:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-12-10 09:25:30 +00:00
|
|
|
else {
|
2018-06-04 09:31:30 +02:00
|
|
|
/* we are back in the area previously selected for keeping
|
2012-05-16 23:37:23 +00:00
|
|
|
* we swap the areas if possible to allow user to choose */
|
2009-12-10 09:25:30 +00:00
|
|
|
if (jd->sa2 != NULL) {
|
|
|
|
jd->sa1 = jd->sa2;
|
|
|
|
jd->sa2 = sa;
|
2010-10-14 12:24:08 +00:00
|
|
|
dir = area_getorientation(jd->sa1, jd->sa2);
|
2014-02-03 18:59:36 +11:00
|
|
|
if (dir == -1) {
|
2009-12-10 09:25:30 +00:00
|
|
|
printf("oops, didn't expect that!\n");
|
|
|
|
}
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-12-10 09:25:30 +00:00
|
|
|
else {
|
2010-10-14 12:24:08 +00:00
|
|
|
dir = area_getorientation(jd->sa1, sa);
|
2014-02-03 18:59:36 +11:00
|
|
|
if (dir != -1) {
|
2009-12-10 09:25:30 +00:00
|
|
|
jd->sa2 = sa;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
2009-12-10 09:25:30 +00:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
2019-02-21 17:22:51 +01:00
|
|
|
|
|
|
|
if (dir == 1)
|
|
|
|
WM_cursor_set(win, BC_N_ARROWCURSOR);
|
|
|
|
else if (dir == 3)
|
|
|
|
WM_cursor_set(win, BC_S_ARROWCURSOR);
|
|
|
|
else if (dir == 2)
|
|
|
|
WM_cursor_set(win, BC_E_ARROWCURSOR);
|
|
|
|
else if (dir == 0)
|
|
|
|
WM_cursor_set(win, BC_W_ARROWCURSOR);
|
|
|
|
else
|
|
|
|
WM_cursor_set(win, BC_STOPCURSOR);
|
|
|
|
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2009-12-10 09:25:30 +00:00
|
|
|
}
|
2008-11-19 16:28:11 +00:00
|
|
|
case LEFTMOUSE:
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event->val == KM_RELEASE) {
|
2010-01-16 22:56:52 +00:00
|
|
|
ED_area_tag_redraw(jd->sa1);
|
|
|
|
ED_area_tag_redraw(jd->sa2);
|
2010-07-25 01:39:47 +00:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
area_join_apply(C, op);
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2008-11-19 16:28:11 +00:00
|
|
|
area_join_exit(C, op);
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
break;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-12-04 01:21:55 +00:00
|
|
|
case RIGHTMOUSE:
|
2008-11-19 16:28:11 +00:00
|
|
|
case ESCKEY:
|
2013-10-30 23:08:53 +00:00
|
|
|
area_join_cancel(C, op);
|
|
|
|
return OPERATOR_CANCELLED;
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Operator for joining two areas (space types) */
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_area_join(wmOperatorType *ot)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-05-19 09:46:41 +00:00
|
|
|
ot->name = "Join Area";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Join selected areas into new window";
|
|
|
|
ot->idname = "SCREEN_OT_area_join";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = area_join_exec;
|
|
|
|
ot->invoke = area_join_invoke;
|
|
|
|
ot->modal = area_join_modal;
|
|
|
|
ot->poll = screen_active_editable;
|
|
|
|
ot->cancel = area_join_cancel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-02-26 13:48:41 +11:00
|
|
|
/* flags */
|
2012-05-08 11:48:19 +00:00
|
|
|
ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-21 19:14:38 +00:00
|
|
|
/* rna */
|
2010-08-20 06:09:58 +00:00
|
|
|
RNA_def_int(ot->srna, "min_x", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX);
|
|
|
|
RNA_def_int(ot->srna, "min_y", -100, INT_MIN, INT_MAX, "Y 1", "", INT_MIN, INT_MAX);
|
|
|
|
RNA_def_int(ot->srna, "max_x", -100, INT_MIN, INT_MAX, "X 2", "", INT_MIN, INT_MAX);
|
|
|
|
RNA_def_int(ot->srna, "max_y", -100, INT_MIN, INT_MAX, "Y 2", "", INT_MIN, INT_MAX);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Screen Area Options Operator
|
|
|
|
* \{ */
|
2011-03-02 14:09:54 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2011-03-02 14:09:54 +00:00
|
|
|
{
|
2018-05-23 22:38:25 +02:00
|
|
|
const wmWindow *win = CTX_wm_window(C);
|
|
|
|
const bScreen *sc = CTX_wm_screen(C);
|
2011-03-02 14:09:54 +00:00
|
|
|
uiPopupMenu *pup;
|
|
|
|
uiLayout *layout;
|
2017-03-22 19:41:03 +01:00
|
|
|
PointerRNA ptr;
|
2013-11-25 13:40:58 +01:00
|
|
|
ScrEdge *actedge;
|
2018-07-02 16:48:18 +02:00
|
|
|
rcti window_rect;
|
2013-11-25 13:40:58 +01:00
|
|
|
|
2018-07-02 16:48:18 +02:00
|
|
|
WM_window_rect_calc(win, &window_rect);
|
|
|
|
actedge = screen_geom_area_map_find_active_scredge(AREAMAP_FROM_SCREEN(sc), &window_rect, event->x, event->y);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (actedge == NULL) return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
pup = UI_popup_menu_begin(C, RNA_struct_ui_name(op->type->srna), ICON_NONE);
|
|
|
|
layout = UI_popup_menu_layout(pup);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2017-10-31 16:58:26 +11:00
|
|
|
uiItemFullO(layout, "SCREEN_OT_area_split", NULL, ICON_NONE, NULL, WM_OP_INVOKE_DEFAULT, 0, &ptr);
|
2011-03-02 14:09:54 +00:00
|
|
|
/* store initial mouse cursor position */
|
2018-07-02 12:24:21 +02:00
|
|
|
RNA_int_set_array(&ptr, "cursor", &event->x);
|
2017-03-22 19:41:03 +01:00
|
|
|
|
2017-10-31 16:58:26 +11:00
|
|
|
uiItemFullO(layout, "SCREEN_OT_area_join", NULL, ICON_NONE, NULL, WM_OP_INVOKE_DEFAULT, 0, &ptr);
|
2017-03-22 19:41:03 +01:00
|
|
|
/* mouse cursor on edge, '4' can fail on wide edges... */
|
|
|
|
RNA_int_set(&ptr, "min_x", event->x + 4);
|
|
|
|
RNA_int_set(&ptr, "min_y", event->y + 4);
|
|
|
|
RNA_int_set(&ptr, "max_x", event->x - 4);
|
|
|
|
RNA_int_set(&ptr, "max_y", event->y - 4);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2011-03-02 14:09:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_area_options(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Area Options";
|
|
|
|
ot->description = "Operations for splitting and merging";
|
|
|
|
ot->idname = "SCREEN_OT_area_options";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-02 14:09:54 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = screen_area_options_invoke;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screen_mainwinactive;
|
2014-02-26 13:48:41 +11:00
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
2011-03-02 14:09:54 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2011-03-02 14:09:54 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Space Data Cleanup Operator
|
|
|
|
* \{ */
|
2011-01-06 17:54:17 +00:00
|
|
|
|
2013-07-28 17:06:31 +00:00
|
|
|
static int spacedata_cleanup_exec(bContext *C, wmOperator *op)
|
2011-01-06 17:54:17 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2011-01-06 17:54:17 +00:00
|
|
|
bScreen *screen;
|
|
|
|
ScrArea *sa;
|
2012-05-08 11:48:19 +00:00
|
|
|
int tot = 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-03-08 09:29:17 +11:00
|
|
|
for (screen = bmain->screens.first; screen; screen = screen->id.next) {
|
2012-05-08 11:48:19 +00:00
|
|
|
for (sa = screen->areabase.first; sa; sa = sa->next) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sa->spacedata.first != sa->spacedata.last) {
|
2012-05-08 11:48:19 +00:00
|
|
|
SpaceLink *sl = sa->spacedata.first;
|
2011-01-06 17:54:17 +00:00
|
|
|
|
|
|
|
BLI_remlink(&sa->spacedata, sl);
|
2014-11-16 13:57:58 +01:00
|
|
|
tot += BLI_listbase_count(&sa->spacedata);
|
2011-01-06 17:54:17 +00:00
|
|
|
BKE_spacedata_freelist(&sa->spacedata);
|
|
|
|
BLI_addtail(&sa->spacedata, sl);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BKE_reportf(op->reports, RPT_INFO, "Removed amount of editors: %d", tot);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-01-06 17:54:17 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_spacedata_cleanup(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2013-01-27 07:23:58 +00:00
|
|
|
ot->name = "Clean-up Space-data";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Remove unused settings for invisible editors";
|
|
|
|
ot->idname = "SCREEN_OT_spacedata_cleanup";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-01-06 17:54:17 +00:00
|
|
|
/* api callbacks */
|
2013-07-28 17:06:31 +00:00
|
|
|
ot->exec = spacedata_cleanup_exec;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = WM_operator_winactive;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-01-06 17:54:17 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Repeat Last Operator
|
|
|
|
* \{ */
|
2008-12-03 19:33:42 +00:00
|
|
|
|
2010-10-14 12:24:08 +00:00
|
|
|
static int repeat_last_exec(bContext *C, wmOperator *UNUSED(op))
|
2008-12-03 19:33:42 +00:00
|
|
|
{
|
2017-03-15 05:16:07 +11:00
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
wmOperator *lastop = wm->operators.last;
|
2017-03-15 02:37:33 +11:00
|
|
|
|
|
|
|
/* Seek last registered operator */
|
|
|
|
while (lastop) {
|
|
|
|
if (lastop->type->flag & OPTYPE_REGISTER) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
lastop = lastop->prev;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lastop) {
|
2017-03-15 05:16:07 +11:00
|
|
|
WM_operator_free_all_after(wm, lastop);
|
2019-01-25 11:29:41 +11:00
|
|
|
WM_operator_repeat_interactive(C, lastop);
|
2017-03-15 02:37:33 +11:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-31 19:40:40 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2008-12-03 19:33:42 +00:00
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_repeat_last(wmOperatorType *ot)
|
2008-12-03 19:33:42 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Repeat Last";
|
|
|
|
ot->description = "Repeat last action";
|
|
|
|
ot->idname = "SCREEN_OT_repeat_last";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-03 19:33:42 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = repeat_last_exec;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-03 19:33:42 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Repeat History Operator
|
|
|
|
* \{ */
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int repeat_history_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2009-01-15 18:28:40 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
2009-01-15 18:28:40 +00:00
|
|
|
wmOperator *lastop;
|
2009-05-23 03:24:15 +00:00
|
|
|
uiPopupMenu *pup;
|
|
|
|
uiLayout *layout;
|
2009-01-15 18:28:40 +00:00
|
|
|
int items, i;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-11-16 13:57:58 +01:00
|
|
|
items = BLI_listbase_count(&wm->operators);
|
2012-05-08 11:48:19 +00:00
|
|
|
if (items == 0)
|
2009-01-15 18:28:40 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
pup = UI_popup_menu_begin(C, RNA_struct_ui_name(op->type->srna), ICON_NONE);
|
|
|
|
layout = UI_popup_menu_layout(pup);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
for (i = items - 1, lastop = wm->operators.last; lastop; lastop = lastop->prev, i--)
|
2017-03-15 02:37:33 +11:00
|
|
|
if ((lastop->type->flag & OPTYPE_REGISTER) && WM_operator_repeat_check(C, lastop)) {
|
2014-02-07 17:10:36 +01:00
|
|
|
uiItemIntO(layout, RNA_struct_ui_name(lastop->type->srna), ICON_NONE, op->type->idname, "index", i);
|
2017-03-15 02:37:33 +11:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2009-01-15 18:28:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int repeat_history_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
op = BLI_findlink(&wm->operators, RNA_int_get(op->ptr, "index"));
|
2012-03-24 06:38:07 +00:00
|
|
|
if (op) {
|
2009-01-15 18:28:40 +00:00
|
|
|
/* let's put it as last operator in list */
|
|
|
|
BLI_remlink(&wm->operators, op);
|
|
|
|
BLI_addtail(&wm->operators, op);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-01 12:00:00 +00:00
|
|
|
WM_operator_repeat(C, op);
|
2009-01-15 18:28:40 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-15 18:28:40 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_repeat_history(wmOperatorType *ot)
|
2009-01-15 18:28:40 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Repeat History";
|
|
|
|
ot->description = "Display menu for previous actions performed";
|
|
|
|
ot->idname = "SCREEN_OT_repeat_history";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-15 18:28:40 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = repeat_history_invoke;
|
|
|
|
ot->exec = repeat_history_exec;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-16 23:53:11 +00:00
|
|
|
RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, 1000);
|
2009-01-15 18:28:40 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Redo Operator
|
|
|
|
* \{ */
|
2009-02-04 11:52:16 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int redo_last_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
|
2009-02-04 11:52:16 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
wmOperator *lastop = WM_operator_last_redo(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (lastop)
|
2009-05-23 03:24:15 +00:00
|
|
|
WM_operator_redo_popup(C, lastop);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-04 11:52:16 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_redo_last(wmOperatorType *ot)
|
2009-02-04 11:52:16 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Redo Last";
|
|
|
|
ot->description = "Display menu for last action performed";
|
|
|
|
ot->idname = "SCREEN_OT_redo_last";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-04 11:52:16 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = redo_last_invoke;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive;
|
2009-02-04 11:52:16 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Region Quad-View Operator
|
|
|
|
* \{ */
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
|
2012-05-27 11:10:27 +00:00
|
|
|
static void view3d_localview_update_rv3d(struct RegionView3D *rv3d)
|
|
|
|
{
|
|
|
|
if (rv3d->localvd) {
|
|
|
|
rv3d->localvd->view = rv3d->view;
|
|
|
|
rv3d->localvd->persp = rv3d->persp;
|
|
|
|
copy_qt_qt(rv3d->localvd->viewquat, rv3d->viewquat);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-08 13:01:05 +00:00
|
|
|
static void region_quadview_init_rv3d(ScrArea *sa, ARegion *ar,
|
|
|
|
const char viewlock, const char view, const char persp)
|
|
|
|
{
|
|
|
|
RegionView3D *rv3d = ar->regiondata;
|
|
|
|
|
2014-03-25 14:21:50 +11:00
|
|
|
if (persp == RV3D_CAMOB) {
|
|
|
|
ED_view3d_lastview_store(rv3d);
|
|
|
|
}
|
|
|
|
|
2013-05-08 13:01:05 +00:00
|
|
|
rv3d->viewlock = viewlock;
|
|
|
|
rv3d->view = view;
|
|
|
|
rv3d->persp = persp;
|
|
|
|
|
|
|
|
ED_view3d_lock(rv3d);
|
|
|
|
view3d_localview_update_rv3d(rv3d);
|
|
|
|
if ((viewlock & RV3D_BOXCLIP) && (persp == RV3D_ORTHO)) {
|
|
|
|
ED_view3d_quadview_update(sa, ar, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
/* insert a region in the area region list */
|
2009-12-04 00:49:02 +00:00
|
|
|
static int region_quadview_exec(bContext *C, wmOperator *op)
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
ARegion *ar = CTX_wm_region(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
/* some rules... */
|
2014-04-26 03:18:18 +10:00
|
|
|
if (ar->regiontype != RGN_TYPE_WINDOW) {
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Only window region can be 4-splitted");
|
2014-04-26 03:18:18 +10:00
|
|
|
}
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (ar->alignment == RGN_ALIGN_QSPLIT) {
|
2014-04-26 03:18:18 +10:00
|
|
|
/* Exit quad-view */
|
2012-05-08 11:48:19 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2009-01-20 18:31:11 +00:00
|
|
|
ARegion *arn;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-20 18:31:11 +00:00
|
|
|
/* keep current region */
|
2012-05-08 11:48:19 +00:00
|
|
|
ar->alignment = 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sa->spacetype == SPACE_VIEW3D) {
|
2014-04-26 03:18:18 +10:00
|
|
|
ARegion *ar_iter;
|
2012-05-08 11:48:19 +00:00
|
|
|
RegionView3D *rv3d = ar->regiondata;
|
2014-04-30 03:49:01 +10:00
|
|
|
|
|
|
|
/* if this is a locked view, use settings from 'User' view */
|
|
|
|
if (rv3d->viewlock) {
|
|
|
|
View3D *v3d_user;
|
|
|
|
ARegion *ar_user;
|
|
|
|
|
|
|
|
if (ED_view3d_context_user_region(C, &v3d_user, &ar_user)) {
|
|
|
|
if (ar != ar_user) {
|
|
|
|
SWAP(void *, ar->regiondata, ar_user->regiondata);
|
|
|
|
rv3d = ar->regiondata;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-26 03:18:18 +10:00
|
|
|
rv3d->viewlock_quad = RV3D_VIEWLOCK_INIT;
|
2012-05-08 11:48:19 +00:00
|
|
|
rv3d->viewlock = 0;
|
2009-02-16 15:08:06 +00:00
|
|
|
rv3d->rflag &= ~RV3D_CLIPPING;
|
2014-04-26 03:18:18 +10:00
|
|
|
|
|
|
|
/* accumulate locks, incase they're mixed */
|
|
|
|
for (ar_iter = sa->regionbase.first; ar_iter; ar_iter = ar_iter->next) {
|
|
|
|
if (ar_iter->regiontype == RGN_TYPE_WINDOW) {
|
|
|
|
RegionView3D *rv3d_iter = ar_iter->regiondata;
|
|
|
|
rv3d->viewlock_quad |= rv3d_iter->viewlock;
|
|
|
|
}
|
|
|
|
}
|
2009-01-20 18:31:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
for (ar = sa->regionbase.first; ar; ar = arn) {
|
|
|
|
arn = ar->next;
|
|
|
|
if (ar->alignment == RGN_ALIGN_QSPLIT) {
|
2009-01-20 18:31:11 +00:00
|
|
|
ED_region_exit(C, ar);
|
|
|
|
BKE_area_region_free(sa->type, ar);
|
|
|
|
BLI_remlink(&sa->regionbase, ar);
|
|
|
|
MEM_freeN(ar);
|
|
|
|
}
|
|
|
|
}
|
2010-01-16 22:56:52 +00:00
|
|
|
ED_area_tag_redraw(sa);
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2009-01-20 18:31:11 +00:00
|
|
|
}
|
2014-04-26 03:18:18 +10:00
|
|
|
else if (ar->next) {
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Only last region can be 4-splitted");
|
2014-04-26 03:18:18 +10:00
|
|
|
}
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
else {
|
2014-04-26 03:18:18 +10:00
|
|
|
/* Enter quad-view */
|
2012-05-08 11:48:19 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
ARegion *newar;
|
|
|
|
int count;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
ar->alignment = RGN_ALIGN_QSPLIT;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
for (count = 0; count < 3; count++) {
|
|
|
|
newar = BKE_area_region_copy(sa->type, ar);
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
BLI_addtail(&sa->regionbase, newar);
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-20 14:23:32 +00:00
|
|
|
/* lock views and set them */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sa->spacetype == SPACE_VIEW3D) {
|
2012-10-10 08:47:53 +00:00
|
|
|
View3D *v3d = sa->spacedata.first;
|
2014-02-12 11:26:02 +11:00
|
|
|
int index_qsplit = 0;
|
2012-10-10 08:47:53 +00:00
|
|
|
|
2011-03-08 07:44:30 +00:00
|
|
|
/* run ED_view3d_lock() so the correct 'rv3d->viewquat' is set,
|
|
|
|
* otherwise when restoring rv3d->localvd the 'viewquat' won't
|
|
|
|
* match the 'view', set on entering localview See: [#26315],
|
|
|
|
*
|
|
|
|
* We could avoid manipulating rv3d->localvd here if exiting
|
|
|
|
* localview with a 4-split would assign these view locks */
|
2013-05-08 13:01:05 +00:00
|
|
|
RegionView3D *rv3d = ar->regiondata;
|
|
|
|
const char viewlock = (rv3d->viewlock_quad & RV3D_VIEWLOCK_INIT) ?
|
|
|
|
(rv3d->viewlock_quad & ~RV3D_VIEWLOCK_INIT) : RV3D_LOCKED;
|
2012-10-10 08:47:53 +00:00
|
|
|
|
2014-02-12 11:26:02 +11:00
|
|
|
region_quadview_init_rv3d(sa, ar, viewlock, ED_view3d_lock_view_from_index(index_qsplit++), RV3D_ORTHO);
|
|
|
|
region_quadview_init_rv3d(sa, (ar = ar->next), viewlock, ED_view3d_lock_view_from_index(index_qsplit++), RV3D_ORTHO);
|
|
|
|
region_quadview_init_rv3d(sa, (ar = ar->next), viewlock, ED_view3d_lock_view_from_index(index_qsplit++), RV3D_ORTHO);
|
2014-04-30 06:23:49 +10:00
|
|
|
/* forcing camera is distracting */
|
|
|
|
#if 0
|
2014-03-28 15:54:18 +11:00
|
|
|
if (v3d->camera) region_quadview_init_rv3d(sa, (ar = ar->next), 0, RV3D_VIEW_CAMERA, RV3D_CAMOB);
|
|
|
|
else region_quadview_init_rv3d(sa, (ar = ar->next), 0, RV3D_VIEW_USER, RV3D_PERSP);
|
2014-04-30 06:23:49 +10:00
|
|
|
#else
|
|
|
|
(void)v3d;
|
|
|
|
#endif
|
2009-01-20 14:23:32 +00:00
|
|
|
}
|
2010-01-16 22:56:52 +00:00
|
|
|
ED_area_tag_redraw(sa);
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
|
|
|
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2009-12-04 00:49:02 +00:00
|
|
|
static void SCREEN_OT_region_quadview(wmOperatorType *ot)
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Toggle Quad View";
|
|
|
|
ot->description = "Split selected area into camera, front, right & top views";
|
|
|
|
ot->idname = "SCREEN_OT_region_quadview";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = region_quadview_exec;
|
|
|
|
ot->poll = ED_operator_region_view3d_active;
|
|
|
|
ot->flag = 0;
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Region Flip Operator
|
|
|
|
* \{ */
|
2008-12-15 11:59:42 +00:00
|
|
|
|
|
|
|
/* flip a region alignment */
|
2010-10-14 12:24:08 +00:00
|
|
|
static int region_flip_exec(bContext *C, wmOperator *UNUSED(op))
|
2008-12-15 11:59:42 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
ARegion *ar = CTX_wm_region(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-12-10 05:05:04 +00:00
|
|
|
if (!ar)
|
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (ar->alignment == RGN_ALIGN_TOP)
|
|
|
|
ar->alignment = RGN_ALIGN_BOTTOM;
|
|
|
|
else if (ar->alignment == RGN_ALIGN_BOTTOM)
|
|
|
|
ar->alignment = RGN_ALIGN_TOP;
|
|
|
|
else if (ar->alignment == RGN_ALIGN_LEFT)
|
|
|
|
ar->alignment = RGN_ALIGN_RIGHT;
|
|
|
|
else if (ar->alignment == RGN_ALIGN_RIGHT)
|
|
|
|
ar->alignment = RGN_ALIGN_LEFT;
|
2010-07-25 01:39:47 +00:00
|
|
|
|
|
|
|
ED_area_tag_redraw(CTX_wm_area(C));
|
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
|
|
|
WM_event_add_mousemove(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-15 11:59:42 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2018-07-02 12:03:56 +02:00
|
|
|
static bool region_flip_poll(bContext *C)
|
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
|
|
|
{
|
|
|
|
ScrArea *area = CTX_wm_area(C);
|
|
|
|
|
|
|
|
/* don't flip anything around in topbar */
|
2018-10-28 22:55:21 +01:00
|
|
|
if (area && area->spacetype == SPACE_TOPBAR) {
|
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
|
|
|
CTX_wm_operator_poll_msg_set(C, "Flipping regions in the Top-bar is not allowed");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ED_operator_areaactive(C);
|
|
|
|
}
|
2009-01-25 20:22:05 +00:00
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_region_flip(wmOperatorType *ot)
|
2008-12-15 11:59:42 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Flip Region";
|
|
|
|
ot->idname = "SCREEN_OT_region_flip";
|
2012-05-06 15:03:31 +00:00
|
|
|
ot->description = "Toggle the region's alignment (left/right or top/bottom)";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-15 11:59:42 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = region_flip_exec;
|
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
|
|
|
ot->poll = region_flip_poll;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = 0;
|
2009-11-27 06:24:09 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Header Toggle Operator
|
|
|
|
* \{ */
|
2017-10-26 22:40:24 +02:00
|
|
|
|
2014-10-14 15:05:44 -03:00
|
|
|
static int header_exec(bContext *C, wmOperator *UNUSED(op))
|
|
|
|
{
|
|
|
|
ARegion *ar = screen_find_region_type(C, RGN_TYPE_HEADER);
|
|
|
|
|
|
|
|
if (ar == NULL) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
ar->flag ^= RGN_FLAG_HIDDEN;
|
|
|
|
|
|
|
|
ED_area_tag_redraw(CTX_wm_area(C));
|
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_header(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2016-03-16 11:33:32 +11:00
|
|
|
ot->name = "Toggle Header";
|
|
|
|
ot->description = "Toggle header display";
|
2014-10-14 15:05:44 -03:00
|
|
|
ot->idname = "SCREEN_OT_header";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->exec = header_exec;
|
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2012-10-25 13:08:47 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Header Toggle Menu Operator
|
|
|
|
* \{ */
|
2012-10-25 13:08:47 +00:00
|
|
|
|
|
|
|
/* show/hide header text menus */
|
|
|
|
static int header_toggle_menus_exec(bContext *C, wmOperator *UNUSED(op))
|
|
|
|
{
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
|
|
|
|
sa->flag = sa->flag ^ HEADER_NO_PULLDOWN;
|
|
|
|
|
2014-04-30 07:48:54 +10:00
|
|
|
ED_area_tag_redraw(sa);
|
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
|
|
|
WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
|
2012-10-25 13:08:47 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void SCREEN_OT_header_toggle_menus(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2014-01-27 18:38:53 +11:00
|
|
|
ot->name = "Expand/Collapse Header Menus";
|
2012-10-25 13:08:47 +00:00
|
|
|
ot->idname = "SCREEN_OT_header_toggle_menus";
|
2014-01-27 18:38:53 +11:00
|
|
|
ot->description = "Expand or collapse the header pulldown menus";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-10-25 13:08:47 +00:00
|
|
|
/* api callbacks */
|
2012-10-26 17:32:50 +00:00
|
|
|
ot->exec = header_toggle_menus_exec;
|
2012-10-25 13:08:47 +00:00
|
|
|
ot->poll = ED_operator_areaactive;
|
|
|
|
ot->flag = 0;
|
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
2012-10-25 13:08:47 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Header Tools Operator
|
|
|
|
* \{ */
|
2017-10-26 22:40:24 +02:00
|
|
|
|
2018-07-06 13:37:39 +02:00
|
|
|
static bool header_context_menu_poll(bContext *C)
|
|
|
|
{
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
return (sa && sa->spacetype != SPACE_STATUSBAR);
|
|
|
|
}
|
|
|
|
|
2012-09-19 18:47:41 +00:00
|
|
|
void ED_screens_header_tools_menu_create(bContext *C, uiLayout *layout, void *UNUSED(arg))
|
2009-11-27 06:24:09 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
2017-10-26 22:40:24 +02:00
|
|
|
const char *but_flip_str = (ar->alignment == RGN_ALIGN_TOP) ? IFACE_("Flip to Bottom") : IFACE_("Flip to Top");
|
2012-09-19 18:47:41 +00:00
|
|
|
|
2018-07-06 13:37:39 +02:00
|
|
|
if (!ELEM(sa->spacetype, SPACE_TOPBAR)) {
|
|
|
|
uiItemO(layout, IFACE_("Toggle Header"), ICON_NONE, "SCREEN_OT_header");
|
|
|
|
}
|
2018-06-01 02:55:16 +02:00
|
|
|
|
2017-10-26 22:40:24 +02:00
|
|
|
/* default is WM_OP_INVOKE_REGION_WIN, which we don't want here. */
|
|
|
|
uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_DEFAULT);
|
2012-09-19 18:47:41 +00:00
|
|
|
|
2018-07-06 13:37:39 +02:00
|
|
|
if (!ELEM(sa->spacetype, SPACE_TOPBAR)) {
|
|
|
|
uiItemO(layout, but_flip_str, ICON_NONE, "SCREEN_OT_region_flip");
|
|
|
|
}
|
|
|
|
|
2014-01-27 18:38:53 +11:00
|
|
|
uiItemO(layout, IFACE_("Collapse Menus"),
|
|
|
|
(sa->flag & HEADER_NO_PULLDOWN) ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT,
|
|
|
|
"SCREEN_OT_header_toggle_menus");
|
2012-10-25 13:08:47 +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
|
|
|
/* file browser should be fullscreen all the time, topbar should
|
|
|
|
* never be. But other regions can be maximized/restored... */
|
|
|
|
if (!ELEM(sa->spacetype, SPACE_FILE, SPACE_TOPBAR)) {
|
2018-07-06 13:37:39 +02:00
|
|
|
uiItemS(layout);
|
|
|
|
|
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 char *but_str = sa->full ? IFACE_("Tile Area") : IFACE_("Maximize Area");
|
|
|
|
uiItemO(layout, but_str, ICON_NONE, "SCREEN_OT_screen_full_area");
|
2009-11-27 06:24:09 +00:00
|
|
|
}
|
2012-09-19 18:47:41 +00:00
|
|
|
}
|
|
|
|
|
2018-06-27 17:07:02 +02:00
|
|
|
static int header_context_menu_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
|
2012-09-19 18:47:41 +00:00
|
|
|
{
|
|
|
|
uiPopupMenu *pup;
|
|
|
|
uiLayout *layout;
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
pup = UI_popup_menu_begin(C, IFACE_("Header"), ICON_NONE);
|
|
|
|
layout = UI_popup_menu_layout(pup);
|
2012-09-19 18:47:41 +00:00
|
|
|
|
|
|
|
ED_screens_header_tools_menu_create(C, layout, NULL);
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2012-09-19 18:47:41 +00:00
|
|
|
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2009-11-27 06:24:09 +00:00
|
|
|
}
|
2009-01-25 20:22:05 +00:00
|
|
|
|
2018-06-27 17:07:02 +02:00
|
|
|
static void SCREEN_OT_header_context_menu(wmOperatorType *ot)
|
2008-12-15 11:59:42 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2018-06-27 17:07:02 +02:00
|
|
|
ot->name = "Header Context Menu";
|
|
|
|
ot->description = "Display header region context menu";
|
|
|
|
ot->idname = "SCREEN_OT_header_context_menu";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-15 11:59:42 +00:00
|
|
|
/* api callbacks */
|
2018-07-06 13:37:39 +02:00
|
|
|
ot->poll = header_context_menu_poll;
|
2018-06-27 17:07:02 +02:00
|
|
|
ot->invoke = header_context_menu_invoke;
|
2008-12-15 11:59:42 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
2018-10-31 00:41:03 +01:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Navigation Bar Tools Menu
|
|
|
|
* \{ */
|
|
|
|
|
|
|
|
void ED_screens_navigation_bar_tools_menu_create(bContext *C, uiLayout *layout, void *UNUSED(arg))
|
|
|
|
{
|
|
|
|
const ARegion *ar = CTX_wm_region(C);
|
|
|
|
const char *but_flip_str = (ar->alignment == RGN_ALIGN_LEFT) ? IFACE_("Flip to Right") : IFACE_("Flip to Left");
|
|
|
|
|
|
|
|
/* default is WM_OP_INVOKE_REGION_WIN, which we don't want here. */
|
|
|
|
uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_DEFAULT);
|
|
|
|
|
|
|
|
uiItemO(layout, but_flip_str, ICON_NONE, "SCREEN_OT_region_flip");
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \} */
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Animation Step Operator
|
|
|
|
*
|
|
|
|
* Animation Step.
|
|
|
|
* \{ */
|
2008-12-21 19:58:25 +00:00
|
|
|
|
Timeline addition: Display cached frames
This started off doing pointcache debugging but it's also very useful for users too.
Previously it was very hard to see the state of the system when you're working caches
such as physics point cache - is it baked? which frames are cached? is it out of date?
Now, for better feedback, cached frames are drawn for the active object at the bottom
of the timeline - a semitransparent area shows the entire cache extents, and more
solid blocks on top show the frames that are cached. Darker versions indicate it's
using a disk cache.
It can be disabled in general in the timeline View -> Caches menu, or by each individual
system that can be shown.
There's still a bit to do on this, behaviour needs to be clarified still eg. deciding what
shows when it's out of date, or when it's been played back but not cached, etc. etc.
Part of this is due to a lack of definition in the point cache system itself, so we should
try and clean up/clarify this behaviour and what it means to users, at the same time.
Also would be interested in extending this to other caches such as fluid cache,
sequencer memory cache etc. in the future, too.
2010-06-22 02:29:52 +00:00
|
|
|
static int match_area_with_refresh(int spacetype, int refresh)
|
|
|
|
{
|
|
|
|
switch (spacetype) {
|
|
|
|
case SPACE_TIME:
|
|
|
|
if (refresh & SPACE_TIME)
|
|
|
|
return 1;
|
|
|
|
break;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Timeline addition: Display cached frames
This started off doing pointcache debugging but it's also very useful for users too.
Previously it was very hard to see the state of the system when you're working caches
such as physics point cache - is it baked? which frames are cached? is it out of date?
Now, for better feedback, cached frames are drawn for the active object at the bottom
of the timeline - a semitransparent area shows the entire cache extents, and more
solid blocks on top show the frames that are cached. Darker versions indicate it's
using a disk cache.
It can be disabled in general in the timeline View -> Caches menu, or by each individual
system that can be shown.
There's still a bit to do on this, behaviour needs to be clarified still eg. deciding what
shows when it's out of date, or when it's been played back but not cached, etc. etc.
Part of this is due to a lack of definition in the point cache system itself, so we should
try and clean up/clarify this behaviour and what it means to users, at the same time.
Also would be interested in extending this to other caches such as fluid cache,
sequencer memory cache etc. in the future, too.
2010-06-22 02:29:52 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-06-03 11:46:57 +02:00
|
|
|
static int match_region_with_redraws(int spacetype, int regiontype, int redraws, bool from_anim_edit)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
if (regiontype == RGN_TYPE_WINDOW) {
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
switch (spacetype) {
|
|
|
|
case SPACE_VIEW3D:
|
2016-06-03 11:46:57 +02:00
|
|
|
if ((redraws & TIME_ALL_3D_WIN) || from_anim_edit)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2019-02-16 16:42:11 +11:00
|
|
|
case SPACE_GRAPH:
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
case SPACE_NLA:
|
2016-06-03 11:46:57 +02:00
|
|
|
if ((redraws & TIME_ALL_ANIM_WIN) || from_anim_edit)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2018-04-20 17:17:10 +02:00
|
|
|
case SPACE_ACTION:
|
|
|
|
/* if only 1 window or 3d windows, we do timeline too
|
|
|
|
* NOTE: Now we do do action editor in all these cases, since timeline is here
|
|
|
|
*/
|
2016-06-03 11:46:57 +02:00
|
|
|
if ((redraws & (TIME_ALL_ANIM_WIN | TIME_REGION | TIME_ALL_3D_WIN)) || from_anim_edit)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2019-02-16 10:44:15 +11:00
|
|
|
case SPACE_PROPERTIES:
|
2012-03-24 06:38:07 +00:00
|
|
|
if (redraws & TIME_ALL_BUTS_WIN)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
|
|
|
case SPACE_SEQ:
|
2016-06-03 11:46:57 +02:00
|
|
|
if ((redraws & (TIME_SEQ | TIME_ALL_ANIM_WIN)) || from_anim_edit)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2009-10-22 23:22:05 +00:00
|
|
|
case SPACE_NODE:
|
2012-03-24 06:38:07 +00:00
|
|
|
if (redraws & (TIME_NODES))
|
2009-10-22 23:22:05 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
case SPACE_IMAGE:
|
2016-06-03 11:46:57 +02:00
|
|
|
if ((redraws & TIME_ALL_IMAGE_WIN) || from_anim_edit)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2011-11-07 12:55:18 +00:00
|
|
|
case SPACE_CLIP:
|
2016-06-03 11:46:57 +02:00
|
|
|
if ((redraws & TIME_CLIPS) || from_anim_edit)
|
2011-11-07 12:55:18 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
}
|
|
|
|
}
|
2014-07-29 15:31:53 +02:00
|
|
|
else if (regiontype == RGN_TYPE_CHANNELS) {
|
|
|
|
switch (spacetype) {
|
2019-02-16 16:42:11 +11:00
|
|
|
case SPACE_GRAPH:
|
2014-07-29 15:31:53 +02:00
|
|
|
case SPACE_ACTION:
|
|
|
|
case SPACE_NLA:
|
|
|
|
if (redraws & TIME_ALL_ANIM_WIN)
|
|
|
|
return 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (regiontype == RGN_TYPE_UI) {
|
|
|
|
if (spacetype == SPACE_CLIP) {
|
2011-11-07 12:55:18 +00:00
|
|
|
/* Track Preview button is on Properties Editor in SpaceClip,
|
2012-03-03 16:31:46 +00:00
|
|
|
* and it's very common case when users want it be refreshing
|
|
|
|
* during playback, so asking people to enable special option
|
2012-03-04 04:35:12 +00:00
|
|
|
* for this is a bit tricky, so add exception here for refreshing
|
2012-03-03 16:31:46 +00:00
|
|
|
* Properties Editor for SpaceClip always */
|
2011-11-07 12:55:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (redraws & TIME_ALL_BUTS_WIN)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (regiontype == RGN_TYPE_HEADER) {
|
2018-04-20 17:17:10 +02:00
|
|
|
if (spacetype == SPACE_ACTION)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (regiontype == RGN_TYPE_PREVIEW) {
|
2009-12-18 13:28:03 +00:00
|
|
|
switch (spacetype) {
|
|
|
|
case SPACE_SEQ:
|
2012-05-08 11:48:19 +00:00
|
|
|
if (redraws & (TIME_SEQ | TIME_ALL_ANIM_WIN))
|
2009-12-18 13:28:03 +00:00
|
|
|
return 1;
|
|
|
|
break;
|
2011-11-07 12:55:18 +00:00
|
|
|
case SPACE_CLIP:
|
|
|
|
return 1;
|
2009-12-18 13:28:03 +00:00
|
|
|
}
|
|
|
|
}
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-27 15:00:01 +01:00
|
|
|
//#define PROFILE_AUDIO_SYNCH
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
|
2008-12-21 19:58:25 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
bScreen *screen = CTX_wm_screen(C);
|
2010-06-01 15:35:38 +00:00
|
|
|
|
2015-03-27 15:00:01 +01:00
|
|
|
#ifdef PROFILE_AUDIO_SYNCH
|
|
|
|
static int old_frame = 0;
|
|
|
|
int newfra_int;
|
|
|
|
#endif
|
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (screen->animtimer && screen->animtimer == event->customdata) {
|
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2017-11-09 11:20:17 +01:00
|
|
|
struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
wmTimer *wt = screen->animtimer;
|
|
|
|
ScreenAnimData *sad = wt->customdata;
|
2012-05-25 12:37:11 +00:00
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
wmWindow *window;
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
ScrArea *sa;
|
2009-08-16 20:37:22 +00:00
|
|
|
int sync;
|
2010-03-21 00:04:50 +00:00
|
|
|
float time;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-08-16 20:37:22 +00:00
|
|
|
/* sync, don't sync, or follow scene setting */
|
2012-05-08 11:48:19 +00:00
|
|
|
if (sad->flag & ANIMPLAY_FLAG_SYNC) sync = 1;
|
|
|
|
else if (sad->flag & ANIMPLAY_FLAG_NO_SYNC) sync = 0;
|
|
|
|
else sync = (scene->flag & SCE_FRAME_DROP);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-06 18:40:15 +00:00
|
|
|
if ((scene->audio.flag & AUDIO_SYNC) &&
|
2014-04-01 11:34:00 +11:00
|
|
|
(sad->flag & ANIMPLAY_FLAG_REVERSE) == false &&
|
2016-05-16 00:48:02 +02:00
|
|
|
isfinite(time = BKE_sound_sync_scene(scene)))
|
2010-02-19 12:20:29 +00:00
|
|
|
{
|
2015-02-04 20:38:31 +01:00
|
|
|
double newfra = (double)time * FPS;
|
2015-03-27 15:00:01 +01:00
|
|
|
|
2015-02-04 20:38:31 +01:00
|
|
|
/* give some space here to avoid jumps */
|
|
|
|
if (newfra + 0.5 > scene->r.cfra && newfra - 0.5 < scene->r.cfra)
|
|
|
|
scene->r.cfra++;
|
|
|
|
else
|
|
|
|
scene->r.cfra = newfra + 0.5;
|
2015-03-27 15:00:01 +01:00
|
|
|
|
|
|
|
#ifdef PROFILE_AUDIO_SYNCH
|
|
|
|
newfra_int = scene->r.cfra;
|
|
|
|
if (newfra_int < old_frame) {
|
|
|
|
printf("back jump detected, frame %d!\n", newfra_int);
|
|
|
|
}
|
|
|
|
else if (newfra_int > old_frame + 1) {
|
|
|
|
printf("forward jump detected, frame %d!\n", newfra_int);
|
|
|
|
}
|
|
|
|
fflush(stdout);
|
|
|
|
old_frame = newfra_int;
|
|
|
|
#endif
|
2012-03-06 18:40:15 +00:00
|
|
|
}
|
|
|
|
else {
|
2010-07-19 11:25:23 +00:00
|
|
|
if (sync) {
|
2012-10-26 06:22:54 +00:00
|
|
|
/* note: this is very simplistic,
|
|
|
|
* its has problem that it may skip too many frames.
|
|
|
|
* however at least this gives a less jittery playback */
|
2012-10-25 11:48:56 +00:00
|
|
|
const int step = max_ii(1, floor((wt->duration - sad->last_duration) * FPS));
|
|
|
|
|
2010-02-19 12:20:29 +00:00
|
|
|
/* skip frames */
|
2010-07-19 11:25:23 +00:00
|
|
|
if (sad->flag & ANIMPLAY_FLAG_REVERSE)
|
2010-02-19 12:20:29 +00:00
|
|
|
scene->r.cfra -= step;
|
|
|
|
else
|
|
|
|
scene->r.cfra += step;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* one frame +/- */
|
2010-07-19 11:25:23 +00:00
|
|
|
if (sad->flag & ANIMPLAY_FLAG_REVERSE)
|
2010-02-19 12:20:29 +00:00
|
|
|
scene->r.cfra--;
|
|
|
|
else
|
|
|
|
scene->r.cfra++;
|
|
|
|
}
|
2009-07-07 07:29:21 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-18 22:21:29 +00:00
|
|
|
sad->last_duration = wt->duration;
|
|
|
|
|
2009-07-31 07:43:47 +00:00
|
|
|
/* reset 'jumped' flag before checking if we need to jump... */
|
|
|
|
sad->flag &= ~ANIMPLAY_FLAG_JUMPED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-07-31 07:43:47 +00:00
|
|
|
if (sad->flag & ANIMPLAY_FLAG_REVERSE) {
|
|
|
|
/* jump back to end? */
|
2010-01-19 20:30:04 +00:00
|
|
|
if (PRVRANGEON) {
|
2009-07-31 07:43:47 +00:00
|
|
|
if (scene->r.cfra < scene->r.psfra) {
|
2012-05-08 11:48:19 +00:00
|
|
|
scene->r.cfra = scene->r.pefra;
|
2009-07-31 07:43:47 +00:00
|
|
|
sad->flag |= ANIMPLAY_FLAG_JUMPED;
|
|
|
|
}
|
2009-07-07 07:29:21 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-07-31 07:43:47 +00:00
|
|
|
if (scene->r.cfra < scene->r.sfra) {
|
2012-05-08 11:48:19 +00:00
|
|
|
scene->r.cfra = scene->r.efra;
|
2009-07-31 07:43:47 +00:00
|
|
|
sad->flag |= ANIMPLAY_FLAG_JUMPED;
|
|
|
|
}
|
2009-07-07 07:29:21 +00:00
|
|
|
}
|
2008-12-22 12:57:53 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-07-31 07:43:47 +00:00
|
|
|
/* jump back to start? */
|
2010-01-19 20:30:04 +00:00
|
|
|
if (PRVRANGEON) {
|
2009-07-31 07:43:47 +00:00
|
|
|
if (scene->r.cfra > scene->r.pefra) {
|
2012-05-08 11:48:19 +00:00
|
|
|
scene->r.cfra = scene->r.psfra;
|
2009-07-31 07:43:47 +00:00
|
|
|
sad->flag |= ANIMPLAY_FLAG_JUMPED;
|
|
|
|
}
|
2009-07-07 07:29:21 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-07-31 07:43:47 +00:00
|
|
|
if (scene->r.cfra > scene->r.efra) {
|
2012-05-08 11:48:19 +00:00
|
|
|
scene->r.cfra = scene->r.sfra;
|
2009-07-31 07:43:47 +00:00
|
|
|
sad->flag |= ANIMPLAY_FLAG_JUMPED;
|
|
|
|
}
|
2009-07-07 07:29:21 +00:00
|
|
|
}
|
2008-12-22 12:57:53 +00:00
|
|
|
}
|
2010-10-11 10:40:34 +00:00
|
|
|
|
2012-07-16 23:23:33 +00:00
|
|
|
/* next frame overridden by user action (pressed jump to first/last frame) */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sad->flag & ANIMPLAY_FLAG_USE_NEXT_FRAME) {
|
2010-10-11 10:40:34 +00:00
|
|
|
scene->r.cfra = sad->nextfra;
|
|
|
|
sad->flag &= ~ANIMPLAY_FLAG_USE_NEXT_FRAME;
|
|
|
|
sad->flag |= ANIMPLAY_FLAG_JUMPED;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2015-03-30 18:27:08 +02:00
|
|
|
if (sad->flag & ANIMPLAY_FLAG_JUMPED) {
|
2015-03-26 11:35:41 +01:00
|
|
|
BKE_sound_seek_scene(bmain, scene);
|
2015-04-02 15:55:43 +11:00
|
|
|
#ifdef PROFILE_AUDIO_SYNCH
|
2015-03-30 18:27:08 +02:00
|
|
|
old_frame = CFRA;
|
2015-04-02 15:55:43 +11:00
|
|
|
#endif
|
2015-03-30 18:27:08 +02:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
/* since we follow drawflags, we can't send notifier but tag regions ourselves */
|
2018-04-06 11:21:20 +02:00
|
|
|
ED_update_for_newframe(bmain, depsgraph);
|
2012-05-25 12:37:11 +00:00
|
|
|
|
|
|
|
for (window = wm->windows.first; window; window = window->next) {
|
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
|
|
|
const bScreen *win_screen = WM_window_get_active_screen(window);
|
|
|
|
|
|
|
|
for (sa = win_screen->areabase.first; sa; sa = sa->next) {
|
2012-05-25 12:37:11 +00:00
|
|
|
ARegion *ar;
|
|
|
|
for (ar = sa->regionbase.first; ar; ar = ar->next) {
|
2015-02-05 22:14:38 +01:00
|
|
|
bool redraw = false;
|
2012-10-31 10:09:06 +00:00
|
|
|
if (ar == sad->ar) {
|
2015-02-05 22:14:38 +01:00
|
|
|
redraw = true;
|
2012-10-31 10:09:06 +00:00
|
|
|
}
|
2016-06-03 11:46:57 +02:00
|
|
|
else if (match_region_with_redraws(sa->spacetype, ar->regiontype, sad->redraws, sad->from_anim_edit)) {
|
2015-02-05 22:14:38 +01:00
|
|
|
redraw = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (redraw) {
|
2012-05-25 12:37:11 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
2015-02-05 22:14:38 +01:00
|
|
|
/* do follow here if editor type supports it */
|
|
|
|
if ((sad->redraws & TIME_FOLLOW)) {
|
|
|
|
if ((ar->regiontype == RGN_TYPE_WINDOW &&
|
2019-02-16 16:42:11 +11:00
|
|
|
ELEM(sa->spacetype, SPACE_SEQ, SPACE_GRAPH, SPACE_ACTION, SPACE_NLA)) ||
|
2015-02-05 22:14:38 +01:00
|
|
|
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
|
|
|
{
|
|
|
|
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
2015-02-11 20:01:21 +01:00
|
|
|
if (scene->r.cfra < ar->v2d.cur.xmin) {
|
|
|
|
ar->v2d.cur.xmax = scene->r.cfra;
|
2015-02-12 13:08:22 +01:00
|
|
|
ar->v2d.cur.xmin = ar->v2d.cur.xmax - w;
|
2015-02-11 20:01:21 +01:00
|
|
|
}
|
|
|
|
else if (scene->r.cfra > ar->v2d.cur.xmax) {
|
2015-02-05 22:14:38 +01:00
|
|
|
ar->v2d.cur.xmin = scene->r.cfra;
|
|
|
|
ar->v2d.cur.xmax = ar->v2d.cur.xmin + w;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-10-31 10:09:06 +00:00
|
|
|
}
|
2012-05-25 12:37:11 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-25 12:37:11 +00:00
|
|
|
if (match_area_with_refresh(sa->spacetype, sad->refresh))
|
|
|
|
ED_area_tag_refresh(sa);
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
|
|
|
/* update frame rate info too
|
|
|
|
* NOTE: this may not be accurate enough, since we might need this after modifiers/etc.
|
2010-02-12 00:44:26 +00:00
|
|
|
* have been calculated instead of just before updates have been done?
|
|
|
|
*/
|
|
|
|
ED_refresh_viewport_fps(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-03-08 17:48:49 +11:00
|
|
|
/* Recalculate the time-step for the timer now that we've finished calculating this,
|
|
|
|
* since the frames-per-second value may have been changed.
|
2009-11-10 09:50:39 +00:00
|
|
|
*/
|
2012-10-20 20:20:02 +00:00
|
|
|
/* TODO: this may make evaluation a bit slower if the value doesn't change... any way to avoid this? */
|
2012-05-08 11:48:19 +00:00
|
|
|
wt->timestep = (1.0 / FPS);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-21 19:58:25 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
return OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
static void SCREEN_OT_animation_step(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Animation Step";
|
|
|
|
ot->description = "Step through animation by position";
|
|
|
|
ot->idname = "SCREEN_OT_animation_step";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = screen_animation_step;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive_norender;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Animation Playback Operator
|
|
|
|
*
|
|
|
|
* Animation Playback with Timer.
|
|
|
|
* \{ */
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
|
2012-05-25 12:37:11 +00:00
|
|
|
/* find window that owns the animation timer */
|
2012-05-25 12:56:29 +00:00
|
|
|
bScreen *ED_screen_animation_playing(const wmWindowManager *wm)
|
2012-05-25 12:37:11 +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
|
|
|
for (wmWindow *win = wm->windows.first; win; win = win->next) {
|
|
|
|
bScreen *screen = WM_window_get_active_screen(win);
|
2014-11-17 20:07:25 +01: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
|
|
|
if (screen->animtimer || screen->scrubbing) {
|
|
|
|
return screen;
|
2014-11-17 20:07:25 +01:00
|
|
|
}
|
|
|
|
}
|
2012-05-25 12:37:11 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-06-05 16:47:01 +02:00
|
|
|
bScreen *ED_screen_animation_no_scrub(const wmWindowManager *wm)
|
|
|
|
{
|
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
|
|
|
for (wmWindow *win = wm->windows.first; win; win = win->next) {
|
|
|
|
bScreen *screen = WM_window_get_active_screen(win);
|
2015-06-05 16:47:01 +02: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
|
|
|
if (screen->animtimer) {
|
|
|
|
return screen;
|
2015-06-05 16:47:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
/* toggle operator */
|
2010-02-21 18:01:41 +00:00
|
|
|
int ED_screen_animation_play(bContext *C, int sync, int mode)
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
bScreen *screen = CTX_wm_screen(C);
|
2010-07-19 11:25:23 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2010-02-21 18:01:41 +00:00
|
|
|
|
2012-05-25 12:56:29 +00:00
|
|
|
if (ED_screen_animation_playing(CTX_wm_manager(C))) {
|
2009-11-27 04:14:56 +00:00
|
|
|
/* stop playback now */
|
Timeline addition: Display cached frames
This started off doing pointcache debugging but it's also very useful for users too.
Previously it was very hard to see the state of the system when you're working caches
such as physics point cache - is it baked? which frames are cached? is it out of date?
Now, for better feedback, cached frames are drawn for the active object at the bottom
of the timeline - a semitransparent area shows the entire cache extents, and more
solid blocks on top show the frames that are cached. Darker versions indicate it's
using a disk cache.
It can be disabled in general in the timeline View -> Caches menu, or by each individual
system that can be shown.
There's still a bit to do on this, behaviour needs to be clarified still eg. deciding what
shows when it's out of date, or when it's been played back but not cached, etc. etc.
Part of this is due to a lack of definition in the point cache system itself, so we should
try and clean up/clarify this behaviour and what it means to users, at the same time.
Also would be interested in extending this to other caches such as fluid cache,
sequencer memory cache etc. in the future, too.
2010-06-22 02:29:52 +00:00
|
|
|
ED_screen_animation_timer(C, 0, 0, 0, 0);
|
2015-03-26 11:35:41 +01:00
|
|
|
BKE_sound_stop_scene(scene);
|
2015-01-25 02:43:57 +01:00
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
}
|
|
|
|
else {
|
2019-01-15 23:24:20 +11:00
|
|
|
/* these settings are currently only available from a menu in the TimeLine */
|
|
|
|
int refresh = SPACE_ACTION;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-10-20 20:20:02 +00:00
|
|
|
if (mode == 1) /* XXX only play audio forwards!? */
|
2015-03-26 11:35:41 +01:00
|
|
|
BKE_sound_play_scene(scene);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-02-01 23:41:01 +00:00
|
|
|
ED_screen_animation_timer(C, screen->redraws_flag, refresh, sync, mode);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-02-01 23:41:01 +00:00
|
|
|
if (screen->animtimer) {
|
2012-05-08 11:48:19 +00:00
|
|
|
wmTimer *wt = screen->animtimer;
|
|
|
|
ScreenAnimData *sad = wt->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
sad->ar = CTX_wm_region(C);
|
2011-12-04 23:13:28 +00:00
|
|
|
}
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
}
|
2010-02-21 18:01:41 +00:00
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2010-04-20 02:39:07 +00:00
|
|
|
static int screen_animation_play_exec(bContext *C, wmOperator *op)
|
2010-02-21 18:01:41 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
int mode = (RNA_boolean_get(op->ptr, "reverse")) ? -1 : 1;
|
|
|
|
int sync = -1;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-01-11 16:32:12 +00:00
|
|
|
if (RNA_struct_property_is_set(op->ptr, "sync"))
|
2012-05-08 11:48:19 +00:00
|
|
|
sync = (RNA_boolean_get(op->ptr, "sync"));
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-02-21 18:01:41 +00:00
|
|
|
return ED_screen_animation_play(C, sync, mode);
|
|
|
|
}
|
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
static void SCREEN_OT_animation_play(wmOperatorType *ot)
|
2008-12-21 19:58:25 +00:00
|
|
|
{
|
2012-03-28 22:43:26 +00:00
|
|
|
PropertyRNA *prop;
|
|
|
|
|
2008-12-21 19:58:25 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Play Animation";
|
|
|
|
ot->description = "Play animation";
|
|
|
|
ot->idname = "SCREEN_OT_animation_play";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-21 19:58:25 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = screen_animation_play_exec;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive_norender;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-28 22:43:26 +00:00
|
|
|
prop = RNA_def_boolean(ot->srna, "reverse", 0, "Play in Reverse", "Animation is played backwards");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
|
|
|
prop = RNA_def_boolean(ot->srna, "sync", 0, "Sync", "Drop frames to maintain framerate");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2008-12-21 19:58:25 +00:00
|
|
|
}
|
2008-12-09 15:59:43 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Animation Cancel Operator
|
|
|
|
* \{ */
|
|
|
|
|
2011-03-27 08:31:10 +00:00
|
|
|
static int screen_animation_cancel_exec(bContext *C, wmOperator *op)
|
2009-10-22 23:22:05 +00:00
|
|
|
{
|
2012-05-25 12:56:29 +00:00
|
|
|
bScreen *screen = ED_screen_animation_playing(CTX_wm_manager(C));
|
2011-03-27 08:31:10 +00:00
|
|
|
|
2012-05-25 12:37:11 +00:00
|
|
|
if (screen) {
|
2017-06-24 18:02:30 +02:00
|
|
|
if (RNA_boolean_get(op->ptr, "restore_frame") && screen->animtimer) {
|
2012-05-08 11:48:19 +00:00
|
|
|
ScreenAnimData *sad = screen->animtimer->customdata;
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2011-03-27 08:31:10 +00:00
|
|
|
|
|
|
|
/* reset current frame before stopping, and just send a notifier to deal with the rest
|
|
|
|
* (since playback still needs to be stopped)
|
|
|
|
*/
|
2012-05-08 11:48:19 +00:00
|
|
|
scene->r.cfra = sad->sfra;
|
2011-03-27 08:31:10 +00:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
|
2011-03-27 08:31:10 +00:00
|
|
|
}
|
|
|
|
|
2009-11-27 04:14:56 +00:00
|
|
|
/* call the other "toggling" operator to clean up now */
|
2010-04-02 08:51:48 +00:00
|
|
|
ED_screen_animation_play(C, 0, 0);
|
2009-11-27 04:14:56 +00:00
|
|
|
}
|
2010-04-02 08:51:48 +00:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
return OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_animation_cancel(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Cancel Animation";
|
|
|
|
ot->description = "Cancel animation, returning to the original frame";
|
|
|
|
ot->idname = "SCREEN_OT_animation_cancel";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = screen_animation_cancel_exec;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive;
|
2011-03-27 08:31:10 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_def_boolean(ot->srna, "restore_frame", true, "Restore Frame", "Restore the frame when animation was initialized");
|
2009-10-22 23:22:05 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
2018-10-05 10:27:04 +10:00
|
|
|
/** \name Box Select Operator (Template)
|
2018-01-21 01:41:58 +11:00
|
|
|
* \{ */
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-06-04 09:31:30 +02:00
|
|
|
/* operator state vars used: (added by default WM callbacks)
|
2018-06-01 18:19:39 +02:00
|
|
|
* xmin, ymin
|
|
|
|
* xmax, ymax
|
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* customdata: the wmGesture pointer
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* callbacks:
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* exec() has to be filled in by user
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* invoke() default WM function
|
|
|
|
* adds modal handler
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
|
|
|
* modal() default WM function
|
2012-03-03 16:31:46 +00:00
|
|
|
* accept modal events while doing it, calls exec(), handles ESC and border drawing
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2012-03-03 16:31:46 +00:00
|
|
|
* poll() has to be filled in by user for context
|
2009-12-10 09:25:30 +00:00
|
|
|
*/
|
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
2008-11-29 15:10:31 +00:00
|
|
|
#if 0
|
2018-10-05 10:27:04 +10:00
|
|
|
static int box_select_exec(bContext *C, wmOperator *op)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
int event_type = RNA_int_get(op->ptr, "event_type");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-05-08 11:48:19 +00:00
|
|
|
if (event_type == LEFTMOUSE)
|
2018-10-05 10:27:04 +10:00
|
|
|
printf("box select do select\n");
|
2012-05-08 11:48:19 +00:00
|
|
|
else if (event_type == RIGHTMOUSE)
|
2018-10-05 10:27:04 +10:00
|
|
|
printf("box select deselect\n");
|
2018-06-04 09:31:30 +02:00
|
|
|
else
|
2018-10-05 10:27:04 +10:00
|
|
|
printf("box select do something\n");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-10-05 10:27:04 +10:00
|
|
|
static void SCREEN_OT_box_select(wmOperatorType *ot)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2018-10-05 10:27:04 +10:00
|
|
|
ot->name = "Box Select";
|
|
|
|
ot->idname = "SCREEN_OT_box_select";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* api callbacks */
|
2018-10-05 10:27:04 +10:00
|
|
|
ot->exec = box_select_exec;
|
|
|
|
ot->invoke = WM_gesture_box_invoke;
|
|
|
|
ot->modal = WM_gesture_box_modal;
|
|
|
|
ot->cancel = WM_gesture_box_cancel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_areaactive;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-24 10:45:36 +00:00
|
|
|
/* rna */
|
2009-01-16 23:53:11 +00:00
|
|
|
RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
|
2012-08-08 20:38:55 +00:00
|
|
|
WM_operator_properties_border(ot);
|
2008-11-19 16:28:11 +00:00
|
|
|
}
|
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
2008-11-29 15:10:31 +00:00
|
|
|
#endif
|
2008-11-19 16:28:11 +00:00
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Full Screen Back Operator
|
|
|
|
* \{ */
|
|
|
|
|
2009-12-08 07:12:06 +00:00
|
|
|
/* *********************** generic fullscreen 'back' button *************** */
|
|
|
|
|
|
|
|
|
|
|
|
static int fullscreen_back_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
bScreen *screen = CTX_wm_screen(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
ScrArea *sa = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-12-08 07:12:06 +00:00
|
|
|
/* search current screen for 'fullscreen' areas */
|
2012-05-08 11:48:19 +00:00
|
|
|
for (sa = screen->areabase.first; sa; sa = sa->next) {
|
2009-12-08 07:12:06 +00:00
|
|
|
if (sa->full) break;
|
|
|
|
}
|
|
|
|
if (!sa) {
|
2011-09-19 12:26:20 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "No fullscreen areas were found");
|
2009-12-08 07:12:06 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2015-01-28 02:32:52 +01:00
|
|
|
|
Fix a bunch of temp full-screen glitches
Steps to reproduce fixed glitches were:
* Change any editor to be file browser from menu, Ctrl+O *from the file browser area*, Esc -> area reset to what it was before changing to file browser initially
* Ctrl+O from any area, F12, Esc -> returns to initial editor in full-screen (expected is file browser in full-screen)
Fixes T46229
Core of the fix is removing old area from spacedata list when going back to previous area (see ED_area_prevspace -> BKE_spacedata_remove). Also, when creating a new temp area we now don't exit old area anymore (needed so SpaceFile->op is kept, but it also makes sense in general)
Aaand finally removes some ugly hacks.
Tested quite a bit, so I think it's safe to apply (besides of remark below), just would like to get things double checked and confirmed. After all, this full-screen stuff finally starts to feel like it's working :P
Note, there's still a memory leak when quitting Blender with temp area open. Haven't found out how to solve yet, but it's not that important for review anyway.
Reviewers: campbellbarton, brecht
Reviewed By: brecht
Subscribers: plyczkowski, Blendify
Maniphest Tasks: T46229
Differential Revision: https://developer.blender.org/D1531
2016-02-29 16:18:42 +01:00
|
|
|
ED_screen_full_prevspace(C, sa);
|
2015-01-28 02:32:52 +01:00
|
|
|
|
2009-12-08 07:12:06 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Back to Previous Screen";
|
|
|
|
ot->description = "Revert back to the original screen layout, before fullscreen area overlay";
|
|
|
|
ot->idname = "SCREEN_OT_back_to_previous";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-12-08 07:12:06 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = fullscreen_back_exec;
|
|
|
|
ot->poll = ED_operator_screenactive;
|
2009-12-08 07:12:06 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Show User Preferences Operator
|
|
|
|
* \{ */
|
2009-07-24 12:43:59 +00:00
|
|
|
|
2018-11-28 12:21:49 +01:00
|
|
|
static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-07-24 12:43:59 +00:00
|
|
|
{
|
2019-01-04 21:40:16 +01:00
|
|
|
int sizex = (500 + UI_NAVIGATION_REGION_WIDTH) * UI_DPI_FAC;
|
|
|
|
int sizey = 520 * UI_DPI_FAC;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
/* changes context! */
|
2017-04-20 00:17:42 +02:00
|
|
|
if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_USERPREFS) != NULL) {
|
2019-01-15 23:24:20 +11:00
|
|
|
/* The header only contains the editor switcher and looks empty.
|
|
|
|
* So hiding in the temp window makes sense. */
|
2019-01-04 21:40:16 +01:00
|
|
|
ScrArea *area = CTX_wm_area(C);
|
|
|
|
ARegion *region = BKE_area_find_region_type(area, RGN_TYPE_HEADER);
|
|
|
|
region->flag |= RGN_FLAG_HIDDEN;
|
2015-10-07 00:27:27 +11:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Failed to open window!");
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2009-07-24 12:43:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-28 12:21:49 +01:00
|
|
|
static void SCREEN_OT_userpref_show(struct wmOperatorType *ot)
|
2009-07-24 12:43:59 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2018-11-28 12:21:49 +01:00
|
|
|
ot->name = "Show Preferences";
|
|
|
|
ot->description = "Edit user preferences and system settings";
|
|
|
|
ot->idname = "SCREEN_OT_userpref_show";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-07-24 12:43:59 +00:00
|
|
|
/* api callbacks */
|
2018-11-28 12:21:49 +01:00
|
|
|
ot->invoke = userpref_show_invoke;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_screenactive;
|
2009-07-10 16:55:49 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Show Drivers Editor Operator
|
|
|
|
* \{ */
|
|
|
|
|
|
|
|
static int drivers_editor_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
|
|
|
{
|
|
|
|
PointerRNA ptr = {{NULL}};
|
|
|
|
PropertyRNA *prop = NULL;
|
|
|
|
int index = -1;
|
|
|
|
uiBut *but = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
int sizex = 900 * UI_DPI_FAC;
|
|
|
|
int sizey = 580 * UI_DPI_FAC;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
/* Get active property to show driver for
|
|
|
|
* - Need to grab it first, or else this info disappears
|
|
|
|
* after we've created the window
|
|
|
|
*/
|
|
|
|
but = UI_context_active_but_prop_get(C, &ptr, &prop, &index);
|
2009-08-15 16:43:03 +00:00
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
/* changes context! */
|
|
|
|
if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_DRIVERS) != NULL) {
|
|
|
|
/* activate driver F-Curve for the property under the cursor */
|
|
|
|
if (but) {
|
|
|
|
FCurve *fcu;
|
|
|
|
bool driven, special;
|
2018-06-04 09:39:04 +02:00
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
fcu = rna_get_fcurve_context_ui(C,
|
|
|
|
&ptr, prop, index,
|
|
|
|
NULL, NULL, &driven, &special);
|
|
|
|
if (fcu) {
|
|
|
|
/* Isolate this F-Curve... */
|
|
|
|
bAnimContext ac;
|
|
|
|
if (ANIM_animdata_get_context(C, &ac)) {
|
|
|
|
int filter = ANIMFILTER_DATA_VISIBLE | ANIMFILTER_NODUPLIS;
|
|
|
|
ANIM_deselect_anim_channels(&ac, ac.data, ac.datatype, 0, ACHANNEL_SETFLAG_CLEAR);
|
|
|
|
ANIM_set_active_channel(&ac, ac.data, ac.datatype, filter, fcu, ANIMTYPE_FCURVE);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Just blindly isolate... This isn't the best, and shouldn't happen, but may be enough... */
|
|
|
|
fcu->flag |= (FCURVE_ACTIVE | FCURVE_SELECTED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Failed to open window!");
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void SCREEN_OT_drivers_editor_show(struct wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Show Drivers Editor";
|
|
|
|
ot->description = "Show drivers editor in a separate window";
|
|
|
|
ot->idname = "SCREEN_OT_drivers_editor_show";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-05-22 16:18:09 +02:00
|
|
|
/* api callbacks */
|
|
|
|
ot->invoke = drivers_editor_show_invoke;
|
|
|
|
ot->poll = ED_operator_screenactive;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \} */
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name New Screen Operator
|
|
|
|
* \{ */
|
2009-07-10 16:55:49 +00:00
|
|
|
|
2010-10-14 12:24:08 +00:00
|
|
|
static int screen_new_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-08-15 16:43:03 +00:00
|
|
|
{
|
2018-06-06 16:32:09 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2012-05-08 11:48:19 +00:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
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
|
|
|
WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
|
|
|
|
WorkSpaceLayout *layout_old = BKE_workspace_active_layout_get(win->workspace_hook);
|
|
|
|
WorkSpaceLayout *layout_new;
|
|
|
|
|
2018-06-06 16:32:09 +02:00
|
|
|
layout_new = ED_workspace_layout_duplicate(bmain, workspace, layout_old, win);
|
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
|
|
|
WM_event_add_notifier(C, NC_SCREEN | ND_LAYOUTBROWSE, layout_new);
|
|
|
|
|
2009-08-15 16:43:03 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2011-02-14 17:55:27 +00:00
|
|
|
static void SCREEN_OT_new(wmOperatorType *ot)
|
2009-08-15 16:43:03 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "New Screen";
|
|
|
|
ot->description = "Add a new screen";
|
|
|
|
ot->idname = "SCREEN_OT_new";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-08-15 16:43:03 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = screen_new_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
2009-08-15 16:43:03 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Delete Screen Operator
|
|
|
|
* \{ */
|
2009-08-15 16:43:03 +00:00
|
|
|
|
2010-10-14 12:24:08 +00:00
|
|
|
static int screen_delete_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-08-15 16:43:03 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
bScreen *sc = CTX_wm_screen(C);
|
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
|
|
|
WorkSpace *workspace = CTX_wm_workspace(C);
|
|
|
|
WorkSpaceLayout *layout = BKE_workspace_layout_find(workspace, sc);
|
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_SCREEN | ND_LAYOUTDELETE, layout);
|
|
|
|
|
2009-08-15 16:43:03 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2011-02-14 17:55:27 +00:00
|
|
|
static void SCREEN_OT_delete(wmOperatorType *ot)
|
2009-08-15 16:43:03 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2013-12-07 13:23:21 +13:00
|
|
|
ot->name = "Delete Screen";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->description = "Delete active screen";
|
|
|
|
ot->idname = "SCREEN_OT_delete";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-08-15 16:43:03 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = screen_delete_exec;
|
2009-08-15 16:43:03 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Region Alpha Blending Operator
|
|
|
|
* \{ */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
|
2013-02-11 00:49:00 +00:00
|
|
|
/* implementation note: a disappearing region needs at least 1 last draw with 100% backbuffer
|
2013-02-02 04:58:03 +00:00
|
|
|
* texture over it- then triple buffer will clear it entirely.
|
2018-09-27 15:35:22 +02:00
|
|
|
* This because flag RGN_HIDDEN is set in end - region doesn't draw at all then */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
|
|
|
|
typedef struct RegionAlphaInfo {
|
|
|
|
ScrArea *sa;
|
|
|
|
ARegion *ar, *child_ar; /* other region */
|
|
|
|
int hidden;
|
|
|
|
} RegionAlphaInfo;
|
|
|
|
|
2018-11-09 03:26:42 +01:00
|
|
|
#define TIMEOUT 0.1f
|
2018-11-09 15:33:51 +01:00
|
|
|
#define TIMESTEP (1.0f / 60.0f)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
|
2018-04-27 10:22:37 +02:00
|
|
|
float ED_region_blend_alpha(ARegion *ar)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
{
|
|
|
|
/* check parent too */
|
2012-12-13 01:00:21 +00:00
|
|
|
if (ar->regiontimer == NULL && (ar->alignment & RGN_SPLIT_PREV) && ar->prev) {
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
ar = ar->prev;
|
2012-12-13 01:00:21 +00:00
|
|
|
}
|
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
if (ar->regiontimer) {
|
|
|
|
RegionAlphaInfo *rgi = ar->regiontimer->customdata;
|
|
|
|
float alpha;
|
2012-12-13 01:00:21 +00:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
alpha = (float)ar->regiontimer->duration / TIMEOUT;
|
|
|
|
/* makes sure the blend out works 100% - without area redraws */
|
2012-12-13 00:47:47 +00:00
|
|
|
if (rgi->hidden) alpha = 0.9f - TIMESTEP - alpha;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
CLAMP(alpha, 0.0f, 1.0f);
|
|
|
|
return alpha;
|
|
|
|
}
|
|
|
|
return 1.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* assumes region has running region-blend timer */
|
2014-01-28 03:52:21 +11:00
|
|
|
static void region_blend_end(bContext *C, ARegion *ar, const bool is_running)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
{
|
|
|
|
RegionAlphaInfo *rgi = ar->regiontimer->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* always send redraw */
|
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
if (rgi->child_ar)
|
|
|
|
ED_region_tag_redraw(rgi->child_ar);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* if running timer was hiding, the flag toggle went wrong */
|
|
|
|
if (is_running) {
|
|
|
|
if (rgi->hidden)
|
|
|
|
rgi->ar->flag &= ~RGN_FLAG_HIDDEN;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (rgi->hidden) {
|
|
|
|
rgi->ar->flag |= rgi->hidden;
|
|
|
|
ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), rgi->sa);
|
|
|
|
}
|
|
|
|
/* area decoration needs redraw in end */
|
|
|
|
ED_area_tag_redraw(rgi->sa);
|
|
|
|
}
|
|
|
|
WM_event_remove_timer(CTX_wm_manager(C), NULL, ar->regiontimer); /* frees rgi */
|
|
|
|
ar->regiontimer = NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
/* assumes that *ar itself is not a splitted version from previous region */
|
|
|
|
void region_blend_start(bContext *C, ScrArea *sa, ARegion *ar)
|
|
|
|
{
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
wmWindow *win = CTX_wm_window(C);
|
|
|
|
RegionAlphaInfo *rgi;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* end running timer */
|
|
|
|
if (ar->regiontimer) {
|
|
|
|
|
2014-01-28 03:52:21 +11:00
|
|
|
region_blend_end(C, ar, true);
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
}
|
|
|
|
rgi = MEM_callocN(sizeof(RegionAlphaInfo), "RegionAlphaInfo");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rgi->hidden = ar->flag & RGN_FLAG_HIDDEN;
|
|
|
|
rgi->sa = sa;
|
|
|
|
rgi->ar = ar;
|
|
|
|
ar->flag &= ~RGN_FLAG_HIDDEN;
|
|
|
|
|
|
|
|
/* blend in, reinitialize regions because it got unhidden */
|
|
|
|
if (rgi->hidden == 0)
|
|
|
|
ED_area_initialize(wm, win, sa);
|
|
|
|
else
|
|
|
|
WM_event_remove_handlers(C, &ar->handlers);
|
|
|
|
|
2012-12-13 01:00:21 +00:00
|
|
|
if (ar->next) {
|
|
|
|
if (ar->next->alignment & RGN_SPLIT_PREV) {
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rgi->child_ar = ar->next;
|
2012-12-13 01:00:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* new timer */
|
|
|
|
ar->regiontimer = WM_event_add_timer(wm, win, TIMERREGION, TIMESTEP);
|
|
|
|
ar->regiontimer->customdata = rgi;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* timer runs in win->handlers, so it cannot use context to find area/region */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int region_blend_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
{
|
|
|
|
RegionAlphaInfo *rgi;
|
|
|
|
wmTimer *timer = event->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* event type is TIMERREGION, but we better check */
|
|
|
|
if (event->type != TIMERREGION || timer == NULL)
|
|
|
|
return OPERATOR_PASS_THROUGH;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
rgi = timer->customdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* always send redraws */
|
|
|
|
ED_region_tag_redraw(rgi->ar);
|
|
|
|
if (rgi->child_ar)
|
|
|
|
ED_region_tag_redraw(rgi->child_ar);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* end timer? */
|
2012-12-13 00:47:47 +00:00
|
|
|
if (rgi->ar->regiontimer->duration > (double)TIMEOUT) {
|
2014-01-28 03:52:21 +11:00
|
|
|
region_blend_end(C, rgi->ar, false);
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_region_blend(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Region Alpha";
|
|
|
|
ot->idname = "SCREEN_OT_region_blend";
|
|
|
|
ot->description = "Blend in and out overlapping region";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* api callbacks */
|
|
|
|
ot->invoke = region_blend_invoke;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* flags */
|
2014-02-26 13:48:41 +11:00
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
/* properties */
|
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
2018-11-29 18:13:01 +11:00
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Space Type Set or Cycle Operator
|
|
|
|
* \{ */
|
|
|
|
|
2019-01-31 16:55:04 +01:00
|
|
|
static bool space_type_set_or_cycle_poll(bContext *C)
|
|
|
|
{
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
return (sa && !ELEM(sa->spacetype, SPACE_TOPBAR, SPACE_STATUSBAR));
|
|
|
|
}
|
|
|
|
|
2018-11-29 18:13:01 +11:00
|
|
|
static int space_type_set_or_cycle_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
const int space_type = RNA_enum_get(op->ptr, "space_type");
|
|
|
|
|
|
|
|
PointerRNA ptr;
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
RNA_pointer_create((ID *)CTX_wm_screen(C), &RNA_Area, sa, &ptr);
|
|
|
|
PropertyRNA *prop_type = RNA_struct_find_property(&ptr, "type");
|
|
|
|
PropertyRNA *prop_ui_type = RNA_struct_find_property(&ptr, "ui_type");
|
|
|
|
|
|
|
|
if (sa->spacetype != space_type) {
|
|
|
|
/* Set the type. */
|
|
|
|
RNA_property_enum_set(&ptr, prop_type, space_type);
|
|
|
|
RNA_property_update(C, &ptr, prop_type);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Types match, cycle the subtype. */
|
|
|
|
const int space_type_ui = RNA_property_enum_get(&ptr, prop_ui_type);
|
|
|
|
const EnumPropertyItem *item;
|
|
|
|
int item_len;
|
|
|
|
bool free;
|
|
|
|
RNA_property_enum_items(C, &ptr, prop_ui_type, &item, &item_len, &free);
|
|
|
|
int index = RNA_enum_from_value(item, space_type_ui);
|
|
|
|
for (int i = 1; i < item_len; i++) {
|
|
|
|
const EnumPropertyItem *item_test = &item[(index + i) % item_len];
|
|
|
|
if ((item_test->value >> 16) == space_type) {
|
|
|
|
RNA_property_enum_set(&ptr, prop_ui_type, item_test->value);
|
|
|
|
RNA_property_update(C, &ptr, prop_ui_type);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (free) {
|
|
|
|
MEM_freeN((void *)item);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_space_type_set_or_cycle(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Cycle Space Type Set";
|
2018-12-24 15:02:20 +01:00
|
|
|
ot->description = "Set the space type or cycle sub-type";
|
2018-11-29 18:13:01 +11:00
|
|
|
ot->idname = "SCREEN_OT_space_type_set_or_cycle";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->exec = space_type_set_or_cycle_exec;
|
2019-01-31 16:55:04 +01:00
|
|
|
ot->poll = space_type_set_or_cycle_poll;
|
2018-11-29 18:13:01 +11:00
|
|
|
|
|
|
|
ot->flag = 0;
|
|
|
|
|
|
|
|
RNA_def_enum(ot->srna, "space_type", rna_enum_space_type_items, SPACE_EMPTY, "Type", "");
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Space Context Cycle Operator
|
|
|
|
* \{ */
|
2016-09-21 14:43:11 +02:00
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem space_context_cycle_direction[] = {
|
2016-09-21 14:43:11 +02:00
|
|
|
{SPACE_CONTEXT_CYCLE_PREV, "PREV", 0, "Previous", ""},
|
|
|
|
{SPACE_CONTEXT_CYCLE_NEXT, "NEXT", 0, "Next", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2016-09-21 14:43:11 +02:00
|
|
|
};
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool space_context_cycle_poll(bContext *C)
|
2016-09-21 14:43:11 +02:00
|
|
|
{
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2016-09-21 14:47:40 +02:00
|
|
|
/* sa might be NULL if called out of window bounds */
|
2019-02-16 10:44:15 +11:00
|
|
|
return (sa && ELEM(sa->spacetype, SPACE_PROPERTIES, SPACE_USERPREF));
|
2016-09-21 14:43:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Helper to get the correct RNA pointer/property pair for changing
|
2016-10-24 10:25:04 +02:00
|
|
|
* the display context of active space type in \a sa.
|
2016-09-21 14:43:11 +02:00
|
|
|
*/
|
|
|
|
static void context_cycle_prop_get(
|
|
|
|
bScreen *screen, const ScrArea *sa,
|
|
|
|
PointerRNA *r_ptr, PropertyRNA **r_prop)
|
|
|
|
{
|
|
|
|
const char *propname;
|
|
|
|
|
|
|
|
switch (sa->spacetype) {
|
2019-02-16 10:44:15 +11:00
|
|
|
case SPACE_PROPERTIES:
|
2016-09-21 14:43:11 +02:00
|
|
|
RNA_pointer_create(&screen->id, &RNA_SpaceProperties, sa->spacedata.first, r_ptr);
|
|
|
|
propname = "context";
|
|
|
|
break;
|
|
|
|
case SPACE_USERPREF:
|
2018-12-21 12:47:44 +11:00
|
|
|
RNA_pointer_create(NULL, &RNA_Preferences, &U, r_ptr);
|
2016-09-21 14:43:11 +02:00
|
|
|
propname = "active_section";
|
|
|
|
break;
|
2016-10-24 10:25:04 +02:00
|
|
|
default:
|
|
|
|
BLI_assert(0);
|
|
|
|
propname = "";
|
2016-09-21 14:43:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
*r_prop = RNA_struct_find_property(r_ptr, propname);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int space_context_cycle_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
|
|
|
{
|
|
|
|
const int direction = RNA_enum_get(op->ptr, "direction");
|
|
|
|
|
|
|
|
PointerRNA ptr;
|
|
|
|
PropertyRNA *prop;
|
|
|
|
context_cycle_prop_get(CTX_wm_screen(C), CTX_wm_area(C), &ptr, &prop);
|
|
|
|
const int old_context = RNA_property_enum_get(&ptr, prop);
|
|
|
|
const int new_context = RNA_property_enum_step(
|
2018-05-29 18:18:36 +02:00
|
|
|
C, &ptr, prop, old_context,
|
|
|
|
direction == SPACE_CONTEXT_CYCLE_PREV ? -1 : 1);
|
2016-09-21 14:43:11 +02:00
|
|
|
RNA_property_enum_set(&ptr, prop, new_context);
|
|
|
|
RNA_property_update(C, &ptr, prop);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_space_context_cycle(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Cycle Space Context";
|
|
|
|
ot->description = "Cycle through the editor context by activating the next/previous one";
|
|
|
|
ot->idname = "SCREEN_OT_space_context_cycle";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->invoke = space_context_cycle_invoke;
|
|
|
|
ot->poll = space_context_cycle_poll;
|
|
|
|
|
|
|
|
ot->flag = 0;
|
|
|
|
|
|
|
|
RNA_def_enum(ot->srna, "direction", space_context_cycle_direction, SPACE_CONTEXT_CYCLE_NEXT, "Direction",
|
|
|
|
"Direction to cycle through");
|
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
|
2018-05-29 17:25:19 +02:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Workspace Cycle Operator
|
|
|
|
* \{ */
|
|
|
|
|
|
|
|
static int space_workspace_cycle_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
|
|
|
{
|
|
|
|
wmWindow *win = CTX_wm_window(C);
|
|
|
|
if (WM_window_is_temp_screen(win)) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2018-06-04 09:39:04 +02:00
|
|
|
|
2018-05-29 17:25:19 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
const int direction = RNA_enum_get(op->ptr, "direction");
|
|
|
|
WorkSpace *workspace_src = WM_window_get_active_workspace(win);
|
2018-09-11 16:20:29 +02:00
|
|
|
WorkSpace *workspace_dst = NULL;
|
|
|
|
|
|
|
|
ListBase ordered;
|
2019-03-08 09:29:17 +11:00
|
|
|
BKE_id_ordered_list(&ordered, &bmain->workspaces);
|
2018-09-11 16:20:29 +02:00
|
|
|
|
|
|
|
for (LinkData *link = ordered.first; link; link = link->next) {
|
|
|
|
if (link->data == workspace_src) {
|
|
|
|
if (direction == SPACE_CONTEXT_CYCLE_PREV) {
|
|
|
|
workspace_dst = (link->prev) ? link->prev->data : NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
workspace_dst = (link->next) ? link->next->data : NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-29 17:25:19 +02:00
|
|
|
if (workspace_dst == NULL) {
|
2018-09-11 16:20:29 +02:00
|
|
|
LinkData *link = (direction == SPACE_CONTEXT_CYCLE_PREV) ? ordered.last : ordered.first;
|
|
|
|
workspace_dst = link->data;
|
2018-05-29 17:25:19 +02:00
|
|
|
}
|
2018-09-11 16:20:29 +02:00
|
|
|
|
|
|
|
BLI_freelistN(&ordered);
|
|
|
|
|
|
|
|
if (workspace_src == workspace_dst) {
|
|
|
|
return OPERATOR_CANCELLED;
|
2018-05-29 17:25:19 +02:00
|
|
|
}
|
2018-09-11 16:20:29 +02:00
|
|
|
|
|
|
|
win->workspace_hook->temp_workspace_store = workspace_dst;
|
|
|
|
WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, workspace_dst);
|
|
|
|
win->workspace_hook->temp_workspace_store = NULL;
|
|
|
|
|
2018-05-29 17:25:19 +02:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SCREEN_OT_workspace_cycle(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Cycle Workspace";
|
|
|
|
ot->description = "Cycle through workspaces";
|
|
|
|
ot->idname = "SCREEN_OT_workspace_cycle";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->invoke = space_workspace_cycle_invoke;
|
2018-09-20 14:47:10 +00:00
|
|
|
ot->poll = ED_operator_screenactive;
|
2018-05-29 17:25:19 +02:00
|
|
|
|
|
|
|
ot->flag = 0;
|
|
|
|
|
|
|
|
RNA_def_enum(ot->srna, "direction", space_context_cycle_direction, SPACE_CONTEXT_CYCLE_NEXT, "Direction",
|
|
|
|
"Direction to cycle through");
|
|
|
|
}
|
|
|
|
|
|
|
|
/** \} */
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Assigning Operator Types
|
|
|
|
* \{ */
|
2010-12-17 19:05:34 +00:00
|
|
|
|
2.5 Branch
==========
* Changed wmOperatorType, removing init/exit callbacks and adding cancel
callback, removed default storage in favor of properties. Defined return
values for exec/invoke/modal/cancel.
* Don't allocate operator on the stack, and removed operator copy for
handlers. Now it frees based on return values from callbacks, and just
keeps a wmOperator on the heap. Also it now registers after the operator
is fully finished, to get the correct final properties.
* Changed OP_get_* functions to return 1 if the property is found and 0
otherwise, gives more readable code in my opinion. Added OP_verify_*
functions to quickly check if the property is available and set if it's
not, that's common for exec/invoke.
* Removed WM_operatortypelist_append in favor of WM_operatortype_append
which takes a function pointer instead of a list, avoids macro's and
duplicating code.
* Fix a crash where the handler would still be used while it was freed by
the operator.
* Spacetypes now have operatortypes() and keymap() callbacks to abstract
them a bit more.
* Renamed C->curarea to C->area for consistency. Removed View3D/View2D/
SpaceIpo from bContext, seems bad to keep these.
* Set context variables like window/screen/area/region to NULL again when
leaving that context, instead of leaving the pointers there.
* Added if(G.f & G_DEBUG) for many of the prints, makes output a bit
cleaner and easier to debug.
* Fixed priority of the editors/interface module in scons, would otherwise
give link errors.
* Added start of generic view2d api.
* Added space_time with some basic drawing and a single operator to change
the frame.
2008-06-11 10:10:31 +00:00
|
|
|
/* called in spacetypes.c */
|
2008-01-07 18:03:41 +00:00
|
|
|
void ED_operatortypes_screen(void)
|
|
|
|
{
|
2.5 getting-back-into-coding commit :)
- cleaned up join and split operations. Most noticable is operator callback
design, which should make a design based on user-less exec() first, then
wrap invoke() and modal() around it. The exec() should be callable with
only Context and properties.
- split now works again; and inversed as previously, if you drag from a
triangle (action zone) inside area it subdivides area as expected.
- dragging from triangle outside area, over an edge, joins areas
- split has been simplified, it had too many options... it could just work
simpler (now)
- 'action zone' now is an operator itself, a widget sending an ACTIONZONE event,
which can be handled by others (so other gestures can be added in action zone
too)
Still evaluating:
- context gets set where?
- code structure confuses... what are proper functions for operators?
- what is WM... should low level screen stuff more there?
- when do you send event, notifier?
- files grow to large, will clean
Oh yeah and docs, docs, docs. Coming! :)
2008-11-17 18:54:03 +00:00
|
|
|
/* generic UI stuff */
|
2008-12-26 11:11:21 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_actionzone);
|
|
|
|
WM_operatortype_append(SCREEN_OT_repeat_last);
|
2009-01-15 18:28:40 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_repeat_history);
|
2009-02-04 11:52:16 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_redo_last);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-11-24 18:59:59 +00:00
|
|
|
/* screen tools */
|
2008-12-26 11:11:21 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_area_move);
|
|
|
|
WM_operatortype_append(SCREEN_OT_area_split);
|
|
|
|
WM_operatortype_append(SCREEN_OT_area_join);
|
2011-03-02 14:09:54 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_area_options);
|
2009-03-11 20:22:06 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_area_dupli);
|
|
|
|
WM_operatortype_append(SCREEN_OT_area_swap);
|
2009-12-04 00:49:02 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_region_quadview);
|
2.5
First version of region-scaling. WIP commit, so bear with me a while!
- All fixed sized regions have a small 'drag' widget, on the left or top.
(not yet for free-sized regions, like 4-split).
- Mouse-over on widget changes cursor and allows drag.
- Click on widget hides/reveals.
- Fun for test; 3d view header, if high enough, draws more rows of
buttons when width is too small.
The WIP stuff;
- It doesn't save yet in files, using the "minsize" variable of region
definitions, also means other similar areas show same sizes now.
- Definitions for pref size, min/max will be added.
- Properties panel in Fcurve window draws widget on wrong place when
hidden (subdiv system needs tweak)
- Widgets don't draw perfect yet, also needs further tweaks.
But, in general it's quite fun and usable. :) Many variatians are possible,
like for real tabs, or little icons, or just click-drag on edge.
The reason to first try the widget/tab variation:
- it re-uses the "Area Action Zone" code, widgets for layouting Screens
- it's visible, hotkey-only options for screen layouts are not preferred.
- distinguish clearly area-edges from region-edges this way. Having the
cursor change shape on every edge (and block input) is probably annoying
too... but that can be tested.
Later more!
2009-05-24 13:29:29 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_region_scale);
|
2009-11-27 11:51:34 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_region_flip);
|
2014-10-14 15:05:44 -03:00
|
|
|
WM_operatortype_append(SCREEN_OT_header);
|
2012-10-25 13:08:47 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_header_toggle_menus);
|
2018-06-27 17:07:02 +02:00
|
|
|
WM_operatortype_append(SCREEN_OT_header_context_menu);
|
2008-12-26 11:11:21 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_screen_set);
|
|
|
|
WM_operatortype_append(SCREEN_OT_screen_full_area);
|
2009-12-08 07:12:06 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_back_to_previous);
|
2011-01-06 17:54:17 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_spacedata_cleanup);
|
2009-02-14 16:43:02 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_screenshot);
|
2018-11-28 12:21:49 +01:00
|
|
|
WM_operatortype_append(SCREEN_OT_userpref_show);
|
2018-05-22 16:18:09 +02:00
|
|
|
WM_operatortype_append(SCREEN_OT_drivers_editor_show);
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_region_blend);
|
2018-11-29 18:13:01 +11:00
|
|
|
WM_operatortype_append(SCREEN_OT_space_type_set_or_cycle);
|
2016-09-21 14:43:11 +02:00
|
|
|
WM_operatortype_append(SCREEN_OT_space_context_cycle);
|
2018-05-29 17:25:19 +02:00
|
|
|
WM_operatortype_append(SCREEN_OT_workspace_cycle);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-17 16:21:14 +00:00
|
|
|
/*frame changes*/
|
2008-12-26 11:11:21 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_frame_offset);
|
2009-08-02 07:08:51 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_frame_jump);
|
2009-07-24 13:34:45 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_keyframe_jump);
|
2013-10-21 15:00:22 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_marker_jump);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Animation playback back in control. And non-blocking still!
- Play follows the "Playback" options in TimeLine menu.
Only the region 'windows' are drawn, not headers, toolbars,
channel views, etc.
The option "Buttons Window" also redraws property regions.
- The Timeline header always redraws, this to denote at least
progressing frame numbers
- For now: if you choose to play 3D views, it also redraws
the TimeLine. Seems to be good convention, but probably
better to add menu option for it?
- Fun test: while playback, change Playback options, works OK!
- New: top header button shows animation play status, and allows
to stop playback
- New: Animation stop/start operator. Assigned to ALT+A. It has
no options yet; just plays active region + all 3D windows now.
Options will follow, based on reviews.
Also ESC won't work for now, just press ALT+A again.
2009-05-21 13:33:04 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_animation_step);
|
2008-12-26 11:11:21 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_animation_play);
|
2009-10-22 23:22:05 +00:00
|
|
|
WM_operatortype_append(SCREEN_OT_animation_cancel);
|
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
|
|
|
|
2009-08-15 16:43:03 +00:00
|
|
|
/* new/delete */
|
|
|
|
WM_operatortype_append(SCREEN_OT_new);
|
|
|
|
WM_operatortype_append(SCREEN_OT_delete);
|
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
|
|
|
|
2008-11-24 18:59:59 +00:00
|
|
|
/* tools shared by more space types */
|
2008-12-31 18:52:15 +00:00
|
|
|
WM_operatortype_append(ED_OT_undo);
|
2011-02-22 02:42:19 +00:00
|
|
|
WM_operatortype_append(ED_OT_undo_push);
|
2012-10-21 05:46:41 +00:00
|
|
|
WM_operatortype_append(ED_OT_redo);
|
2016-12-29 12:38:20 +01:00
|
|
|
WM_operatortype_append(ED_OT_undo_redo);
|
Code holiday commit:
- fix: user pref, window title was reset to 'Blender' on tab usage
- Undo history menu back:
- name "Undo History"
- hotkey alt+ctrl+z (alt+apple+z for mac)
- works like 2.4x, only for global undo, editmode and particle edit.
- Menu scroll
- for small windows or screens, popup menus now allow to display
all items, using internal scrolling
- works with a timer, scrolling 10 items per second when mouse
is over the top or bottom arrow
- if menu is too big to display, it now draws to top or bottom,
based on largest available space.
- also works for hotkey driven pop up menus.
- User pref "DPI" follows widget/layout size
- widgets & headers now become bigger and smaller, to match
'dpi' font sizes. Works well to match UI to monitor size.
- note that icons can get fuzzy, we need better mipmaps for it
2011-06-04 17:03:46 +00:00
|
|
|
WM_operatortype_append(ED_OT_undo_history);
|
2015-12-03 20:18:32 +11:00
|
|
|
|
|
|
|
WM_operatortype_append(ED_OT_flush_edits);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/** \name Operator Key Map
|
|
|
|
* \{ */
|
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
static void keymap_modal_set(wmKeyConfig *keyconf)
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem modal_items[] = {
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
{KM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
|
|
|
|
{KM_MODAL_APPLY, "APPLY", 0, "Apply", ""},
|
2018-01-18 11:22:58 +11:00
|
|
|
{KM_MODAL_SNAP_ON, "SNAP", 0, "Snap on", ""},
|
|
|
|
{KM_MODAL_SNAP_OFF, "SNAP_OFF", 0, "Snap off", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
|
|
|
};
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
wmKeyMap *keymap;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
/* Standard Modal keymap ------------------------------------------------ */
|
2012-05-08 11:48:19 +00:00
|
|
|
keymap = WM_modalkeymap_add(keyconf, "Standard Modal Map", modal_items);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "SCREEN_OT_area_move");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2.5
Modal keymaps.
I've tried to make it as simple as possible, yet still using sufficient facilities to enable self-documenting UIs, saving/reading in files, and proper Python support.
The simplicity is: the 'modal keymap' just checks an event, uses event matching similarly to other keymap matching, and if there's a match it changes the event type, and sets the event value to what the modal keymap has defined. The event values are being defined using EnumPropertyItem structs, so the UI will be able to show all options in self-documenting way.
This system also allows to still handle hardcoded own events.
Tech doc:
1) define keymap
- Create map with unique name, WM_modalkeymap_add()
- Give map property definitions (EnumPropertyItem *)
This only for UI, so user can get information on available options
2) items
- WM_modalkeymap_add_item(): give it an enum value for events
3) activate
- In keymap definition code, assign the modal keymap to operatortype
WM_modalkeymap_assign()
4) event manager
- The event handler will check for modal keymap, if so:
- If the modal map has a match:
- Sets event->type to EVT_MODAL_MAP
- Sets event->val to the enum value
5) modal handler
- If event type is EVT_MODAL_MAP:
- Check event->val, handle it
- Other events can just be handled still
Two examples added in the code:
editors/transform/transform.c: transform_modal_keymap()
editors/screen/screen_ops.c: keymap_modal_set()
Also: to support 'key release' the define KM_RELEASE now is officially
used in event manager, this is not '0', so don't check key events with
the old convention if(event->val) but use if(event->val==KM_PRESS)
2009-07-21 11:03:07 +00:00
|
|
|
}
|
|
|
|
|
2018-10-22 17:18:42 +02:00
|
|
|
static bool blend_file_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), const char **UNUSED(tooltip))
|
2010-12-17 19:05:34 +00:00
|
|
|
{
|
2012-05-08 11:48:19 +00:00
|
|
|
if (drag->type == WM_DRAG_PATH) {
|
|
|
|
if (drag->icon == ICON_FILE_BLEND)
|
2011-04-21 15:53:30 +00:00
|
|
|
return 1;
|
2010-12-17 19:05:34 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-10-22 17:18:42 +02:00
|
|
|
static void blend_file_drop_copy(wmDrag *drag, wmDropBox *drop)
|
2010-12-17 19:05:34 +00:00
|
|
|
{
|
|
|
|
/* copy drag path to properties */
|
|
|
|
RNA_string_set(drop->ptr, "filepath", drag->path);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2.5 Branch
==========
* Changed wmOperatorType, removing init/exit callbacks and adding cancel
callback, removed default storage in favor of properties. Defined return
values for exec/invoke/modal/cancel.
* Don't allocate operator on the stack, and removed operator copy for
handlers. Now it frees based on return values from callbacks, and just
keeps a wmOperator on the heap. Also it now registers after the operator
is fully finished, to get the correct final properties.
* Changed OP_get_* functions to return 1 if the property is found and 0
otherwise, gives more readable code in my opinion. Added OP_verify_*
functions to quickly check if the property is available and set if it's
not, that's common for exec/invoke.
* Removed WM_operatortypelist_append in favor of WM_operatortype_append
which takes a function pointer instead of a list, avoids macro's and
duplicating code.
* Fix a crash where the handler would still be used while it was freed by
the operator.
* Spacetypes now have operatortypes() and keymap() callbacks to abstract
them a bit more.
* Renamed C->curarea to C->area for consistency. Removed View3D/View2D/
SpaceIpo from bContext, seems bad to keep these.
* Set context variables like window/screen/area/region to NULL again when
leaving that context, instead of leaving the pointers there.
* Added if(G.f & G_DEBUG) for many of the prints, makes output a bit
cleaner and easier to debug.
* Fixed priority of the editors/interface module in scons, would otherwise
give link errors.
* Added start of generic view2d api.
* Added space_time with some basic drawing and a single operator to change
the frame.
2008-06-11 10:10:31 +00:00
|
|
|
/* called in spacetypes.c */
|
2009-10-22 23:22:05 +00:00
|
|
|
void ED_keymap_screen(wmKeyConfig *keyconf)
|
2008-01-07 18:03:41 +00:00
|
|
|
{
|
2010-12-17 19:05:34 +00:00
|
|
|
ListBase *lb;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
/* Screen Editing ------------------------------------------------ */
|
2018-11-08 15:59:51 +11:00
|
|
|
WM_keymap_ensure(keyconf, "Screen Editing", 0, 0);
|
2016-03-16 11:33:32 +11:00
|
|
|
|
2009-11-27 06:24:09 +00:00
|
|
|
/* Header Editing ------------------------------------------------ */
|
2016-03-16 11:33:32 +11:00
|
|
|
/* note: this is only used when the cursor is inside the header */
|
2018-11-08 15:59:51 +11:00
|
|
|
WM_keymap_ensure(keyconf, "Header", 0, 0);
|
2015-11-28 18:15:56 +01:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
/* Screen General ------------------------------------------------ */
|
2018-11-08 15:59:51 +11:00
|
|
|
WM_keymap_ensure(keyconf, "Screen", 0, 0);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-07-19 05:20:30 +00:00
|
|
|
/* Anim Playback ------------------------------------------------ */
|
2018-11-08 15:59:51 +11:00
|
|
|
WM_keymap_ensure(keyconf, "Frames", 0, 0);
|
2010-07-18 14:46:52 +00:00
|
|
|
|
2010-12-17 19:05:34 +00:00
|
|
|
/* dropbox for entire window */
|
2012-05-08 11:48:19 +00:00
|
|
|
lb = WM_dropboxmap_find("Window", 0, 0);
|
2018-10-22 17:18:42 +02:00
|
|
|
WM_dropbox_add(lb, "WM_OT_drop_blend_file", blend_file_drop_poll, blend_file_drop_copy);
|
2014-07-21 12:02:05 +02:00
|
|
|
WM_dropbox_add(lb, "UI_OT_drop_color", UI_drop_color_poll, UI_drop_color_copy);
|
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
keymap_modal_set(keyconf);
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
2018-01-21 01:41:58 +11:00
|
|
|
/** \} */
|