diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-27 12:47:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 12:47:31 +0200 |
| commit | 3fe72c7f77da5f7ce6574e5ea05911bc4ef9e5e8 (patch) | |
| tree | f82e4a46f9667cd30bc5c6a77cb45f030fa541ce | |
| parent | ebd472de3a096325be6bc65b03191adb50198ad9 (diff) | |
| parent | ae112557100083a6b30e2addcccf58546d87b12f (diff) | |
Merge pull request #12386 from zedutchgandalf/popup-text-margins
Fix text margins in property editor pop-up.
| -rw-r--r-- | editor/property_editor.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index b7cc9347f2..3fbd0bbcf3 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -1788,13 +1788,14 @@ void CustomPropertyEditor::config_action_buttons(const List<String> &p_strings) void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns, int p_label_w, const List<String> &p_strings) { - int w = 80; - int h = 20; - int m = 10; + int cell_width = 80; + int cell_height = 20; + int cell_margin = 10; + int hor_spacing = 8; // Spacing between labels and their values int rows = ((p_amount - 1) / p_columns) + 1; - set_size(Size2(m * (1 + p_columns) + (w + p_label_w) * p_columns, m * (1 + rows) + h * rows)); + set_size(Size2(cell_margin * (1 + p_columns) + (cell_width + p_label_w + hor_spacing) * p_columns, cell_margin * (1 + rows) + cell_height * rows)); for (int i = 0; i < MAX_VALUE_EDITORS; i++) { @@ -1805,9 +1806,9 @@ void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns, int value_editor[i]->show(); value_label[i]->show(); value_label[i]->set_text(i < p_strings.size() ? p_strings[i] : String("")); - value_editor[i]->set_position(Point2(m + p_label_w + c * (w + m + p_label_w), m + r * (h + m))); - value_editor[i]->set_size(Size2(w, h)); - value_label[i]->set_position(Point2(m + c * (w + m + p_label_w), m + r * (h + m))); + value_editor[i]->set_position(Point2(cell_margin + p_label_w + hor_spacing + c * (cell_width + cell_margin + p_label_w + hor_spacing), cell_margin + r * (cell_height + cell_margin))); + value_editor[i]->set_size(Size2(cell_width, cell_height)); + value_label[i]->set_position(Point2(cell_margin + c * (cell_width + cell_margin + p_label_w + hor_spacing), cell_margin + r * (cell_height + cell_margin))); value_editor[i]->set_editable(!read_only); } else { value_editor[i]->hide(); |