UI: disable 3 column toolbars

They conflict a little with showing a narrow toolbar w/ text.
This commit is contained in:
Campbell Barton 2018-04-27 18:20:48 +02:00
parent eb4c60124c
commit 351d782286
2 changed files with 4 additions and 7 deletions

View File

@ -252,16 +252,13 @@ class ToolSelectPanelHelper:
del view2d, ui_scale
empty_text = ""
if width_scale > 200.0:
if width_scale > 120.0:
show_text = True
use_columns = False
else:
show_text = False
if width_scale > 120.0:
column_count = 3
use_columns = True
empty_text = " " # needed for alignment, grr
elif width_scale > 80.0:
# 2 column layout, disabled
if width_scale > 80.0:
column_count = 2
use_columns = True
empty_text = " " # needed for alignment, grr

View File

@ -1268,7 +1268,7 @@ static int view3d_tools_region_snap_size(const ARegion *ar, int size, int axis)
{
if (axis == 0) {
/* Note, this depends on the icon size: see #ICON_DEFAULT_HEIGHT_TOOLBAR. */
const float snap_units[3] = {3 + 0.25f, 5 + 0.25, 7 + 0.25};
const float snap_units[] = {3 + 0.25f, 5 + 0.25};
const float aspect = BLI_rctf_size_x(&ar->v2d.cur) / (BLI_rcti_size_x(&ar->v2d.mask) + 1);
int best_diff = INT_MAX;
int best_size = size;