diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_screen.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/screen.c | 16 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 24 |
7 files changed, 46 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 8db0689ad9c..814e527cbc5 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -210,7 +210,7 @@ class USERPREF_PT_interface_editors(PreferencePanel): flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False) - flow.row().prop(view, "header_align_default", expand=True) + flow.row().prop(view, "header_align") flow.prop(system, "use_region_overlap") flow.prop(view, "show_layout_ui", text="Corner Splitting") flow.prop(view, "color_picker_type") diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index 60cfc15a928..d064929848d 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -357,4 +357,6 @@ void BKE_screen_remove_double_scredges(struct bScreen *sc); void BKE_screen_remove_unused_scredges(struct bScreen *sc); void BKE_screen_remove_unused_scrverts(struct bScreen *sc); +void BKE_screen_header_alignment_reset(struct bScreen *screen); + #endif diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 2f1393e43d2..af3384d2023 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -846,3 +846,19 @@ bool BKE_screen_is_used(const bScreen *screen) { return (screen->winid != 0); } + +void BKE_screen_header_alignment_reset(bScreen *screen) +{ + int alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; + for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { + for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) { + if (ar->regiontype == RGN_TYPE_HEADER) { + if (ELEM(sa->spacetype, SPACE_FILE, SPACE_USERPREF, SPACE_OUTLINER, SPACE_BUTS)) { + ar->alignment = RGN_ALIGN_TOP; + continue; + } + ar->alignment = alignment; + } + } + } +} diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index c02f5638452..72e4e2d0fe1 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -455,7 +455,7 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) USER_FLAG_DEPRECATED_4); userdef->uiflag &= ~( - USER_UIFLAG_DEPRECATED_8 | + USER_HEADER_FROM_PREF | USER_UIFLAG_DEPRECATED_12 | USER_UIFLAG_DEPRECATED_22); } diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 69a4bde4821..7d76140f741 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -477,6 +477,12 @@ void ED_screens_initialize(Main *bmain, wmWindowManager *wm) ED_screen_set_active_region(NULL, win, &win->eventstate->x); } } + + if (U.uiflag & USER_HEADER_FROM_PREF) { + for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + BKE_screen_header_alignment_reset(screen); + } + } } void ED_screen_ensure_updated(wmWindowManager *wm, wmWindow *win, bScreen *screen) diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 23bd962760b..228812cd243 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -872,7 +872,8 @@ typedef enum eUserpref_UI_Flag { USER_PLAINMENUS = (1 << 5), USER_LOCK_CURSOR_ADJUST = (1 << 6), USER_HEADER_BOTTOM = (1 << 7), - USER_UIFLAG_DEPRECATED_8 = (1 << 8), /* cleared */ + /** Otherwise use header alignment from the file. */ + USER_HEADER_FROM_PREF = (1 << 8), USER_MENUOPENAUTO = (1 << 9), USER_DEPTH_CURSOR = (1 << 10), USER_AUTOPERSP = (1 << 11), diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 35e7c286471..b2536ba5cfa 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -101,6 +101,7 @@ static const EnumPropertyItem rna_enum_studio_light_type_items[] = { #include "BKE_mesh_runtime.h" #include "BKE_pbvh.h" #include "BKE_paint.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" @@ -152,6 +153,16 @@ static void rna_userdef_update_ui(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi WM_main_add_notifier(NC_SCREEN | NA_EDITED, NULL); /* refresh region sizes */ } +static void rna_userdef_update_ui_header_default(Main *bmain, Scene *scene, PointerRNA *ptr) +{ + if (U.uiflag & USER_HEADER_FROM_PREF) { + for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + BKE_screen_header_alignment_reset(screen); + } + rna_userdef_update_ui(bmain, scene, ptr); + } +} + static void rna_userdef_language_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) { BLF_cache_clear(); @@ -3839,16 +3850,17 @@ static void rna_def_userdef_view(BlenderRNA *brna) "Otherwise menus, etc will always be top to bottom, left to right, " "no matter opening direction"); - static const EnumPropertyItem header_align_default_items[] = { - {0, "TOP", 0, "Top", ""}, - {USER_HEADER_BOTTOM, "BOTTOM", 0, "Bottom", ""}, + static const EnumPropertyItem header_align_items[] = { + {0, "NONE", 0, "Default", "Keep existing header alignment"}, + {USER_HEADER_FROM_PREF, "TOP", 0, "Top", "Top aligned on load"}, + {USER_HEADER_FROM_PREF | USER_HEADER_BOTTOM, "BOTTOM", 0, "Bottom", "Bottom align on load (except for property editors)"}, {0, NULL, 0, NULL, NULL}, }; - prop = RNA_def_property(srna, "header_align_default", PROP_ENUM, PROP_NONE); - RNA_def_property_enum_items(prop, header_align_default_items); + prop = RNA_def_property(srna, "header_align", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, header_align_items); RNA_def_property_enum_bitflag_sdna(prop, NULL, "uiflag"); RNA_def_property_ui_text(prop, "Header Position", "Default header position for new space-types"); - RNA_def_property_update(prop, 0, "rna_userdef_update"); + RNA_def_property_update(prop, 0, "rna_userdef_update_ui_header_default"); static const EnumPropertyItem text_hinting_items[] = { {0, "AUTO", 0, "Auto", ""}, |