Bugfix [#33623] Missing labels in UI for Expanded Polynomial FModifier

Fix for second issue in the UI for this FModifier, where the "x" would not be
shown for order=1 where DPI >= 88 and Text AA is off, as the label sizes used
were too small.
This commit is contained in:
Joshua Leung
2012-12-21 05:55:17 +00:00
parent b2c66e268f
commit 44dd39ea22

View File

@@ -151,7 +151,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
}
else {
/* basic size (just "x") */
maxXWidth = 15;
maxXWidth = UI_GetStringWidth("x") + 10;
}
/* draw controls for each coefficient and a + sign at end of row */
@@ -233,14 +233,14 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
/* closing bracket and multiplication sign */
if ( (i != (data->poly_order - 1)) || ((i == 0) && data->poly_order == 2) ) {
uiDefBut(block, LABEL, 1, ") <20>", 0, 0, 30, 20, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, LABEL, 1, ") <20>", 0, 0, 40, 20, NULL, 0.0, 0.0, 0, 0, "");
/* set up new row for the next pair of coefficients */
row = uiLayoutRow(layout, TRUE);
block = uiLayoutGetBlock(row);
}
else
uiDefBut(block, LABEL, 1, ") ", 0, 0, 30, 20, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, LABEL, 1, ") ", 0, 0, 40, 20, NULL, 0.0, 0.0, 0, 0, "");
}
}
break;