Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2011-06-05 16:57:09 +0400
committerTon Roosendaal <ton@blender.org>2011-06-05 16:57:09 +0400
commit485a89f5d322358c8e32aee372fd6fa5cca4b3ee (patch)
treedd75bdba3736be999b7c3846d5f74ec92ba24da7
parent619df86faddf99bffa84b2d20bba69e68c4dc6a5 (diff)
Bugfix: new DPI-controlled UI size code was setting 'view2d re-init'
flag on ED_area_initialize(). This however was causing 2 problems; - the view state got reset (popping window view back) - the view2d operator polls failed (sliders didnt work) This re-init was only needed for the headers though, limiting it to these types of regions solves it.
-rw-r--r--source/blender/editors/screen/area.c5
-rw-r--r--source/blender/editors/space_api/spacetypes.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 05214a63325..828699e85ce 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -967,8 +967,9 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
uiFreeBlocks(NULL, &ar->uiblocks);
}
- /* rechecks all 2d matrices */
- ar->v2d.flag &= ~V2D_IS_INITIALISED;
+ /* rechecks 2d matrix for header on dpi changing, do not do for other regions, it resets view && blocks view2d operator polls (ton) */
+ if(ar->regiontype==RGN_TYPE_HEADER)
+ ar->v2d.flag &= ~V2D_IS_INITIALISED;
}
}
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 8d8cdcc7183..4f8cb8a57b2 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -70,6 +70,9 @@ void ED_spacetypes_init(void)
const ListBase *spacetypes;
SpaceType *type;
+ /* UI_UNIT_X is now a variable, is used in some spacetype inits? */
+ U.widget_unit= 20;
+
/* create space types */
ED_spacetype_outliner();
ED_spacetype_time();