diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-28 22:59:36 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-28 22:59:36 +0400 |
| commit | 8cf4ef091c91fa4666aa9b017ddba61b52c02806 (patch) | |
| tree | 329498b41ccbb956cd703c6e643a16adb35866cb /source/blender/editors/interface | |
| parent | 801d44a09efd98a2345dd8b5938b4d811bbf68fc (diff) | |
2.5: various one-liner fixes
* Image window only show game properties in game mode.
* Fix image window render info drawing wrong with alpha enabled.
* Win32 editmode cursor now uses a different one than the system
cursor, that one is barely visible, especially in the new theme
colors.
* Center text in operator header print.
* Fix sequencer unlock shortcut key.
* Fix uv layer / vertex color active render button now graying out.
* Workaround to get default zoom level 1:1 again for new buttons
(will try to fix properly later, is due to scrollbars).
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 8b01c341565..4383ba8858b 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1558,7 +1558,7 @@ ListBase uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, char *pr /* XXX hardcoded */ if(itemptr.type == &RNA_MeshTextureFaceLayer || itemptr.type == &RNA_MeshColorLayer) { uiBlockSetEmboss(block, UI_EMBOSSN); - uiItemR(subrow, "", ICON_SCENE, &itemptr, "active_render", 0, 0, 0); + uiDefIconButR(block, TOG, 0, ICON_SCENE, 0, 0, UI_UNIT_X, UI_UNIT_Y, &itemptr, "active_render", 0, 0, 0, 0, 0, NULL); uiBlockSetEmboss(block, UI_EMBOSS); } diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 0f7532383c9..c76110ac440 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -273,10 +273,12 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) v2d->tot.ymin= -winy; v2d->cur.xmin= 0.0f; - v2d->cur.xmax= winx*panelzoom; + /* bad workaround for keeping zoom level with scrollers */ + v2d->cur.xmax= (winx - V2D_SCROLL_WIDTH)*panelzoom; v2d->cur.ymax= 0.0f; - v2d->cur.ymin= -winy*panelzoom; + /* bad workaround for keeping zoom level with scrollers */ + v2d->cur.ymin= (-winy + V2D_SCROLL_HEIGHT)*panelzoom; } break; |