From 83d35c25d0fcc9b095ef1a0e1c5c290bb04d3017 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Sat, 11 May 2019 10:48:05 -0700 Subject: UI: Nudge Curve Editor Away from Scrollbar This patch increases left and right padding of the Curve Editor to avoid scrollbars Reviewed by Brecht Van Lommel --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- source/blender/editors/interface/interface_widgets.c | 3 +++ source/tools | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index 199b3a7c2f0..2eab3be9bbd 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 199b3a7c2f03a3af6f612e092d3359f7b6f288cc +Subproject commit 2eab3be9bbdb2d27e36cfde38fdcba5fc264f223 diff --git a/release/scripts/addons b/release/scripts/addons index 3683429de05..fa8787a67ee 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 3683429de050b8026835d17ae7288a436c31cdb6 +Subproject commit fa8787a67ee6b34712896637edb0574973447a9b diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index ca68e1d4e01..f72ec13e35d 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit ca68e1d4e01d343b1758118b500bdc92eaea30ee +Subproject commit f72ec13e35dbd635c08ca331c8fac54086b0811d diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 8724de41e8e..5bcbc18fe27 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -4669,6 +4669,9 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct break; case UI_BTYPE_CURVE: + /* do not draw right to edge of rect */ + rect->xmin += (0.2f * UI_UNIT_X); + rect->xmax -= (0.2f * UI_UNIT_X); ui_draw_but_CURVE(ar, but, &tui->wcol_regular, rect); break; diff --git a/source/tools b/source/tools index 3ee979c1eb0..2afbb8ec472 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 3ee979c1eb0752bae62295c78e367660ae084bde +Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685 -- cgit v1.2.3