diff options
| author | Gilles Roudiere <gilles.roudiere@gmail.com> | 2017-10-14 10:08:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 10:08:03 +0200 |
| commit | 0362a156b0ed808dac990d8bfd3653bb7ff71d1e (patch) | |
| tree | 7f7abdc38d6c66d7bba722ca54cb5214920425c6 /scene/gui | |
| parent | 4b45ebb3de5b979f6efc8b200caacbd232381418 (diff) | |
| parent | 9001ba26aa3e97f2618bf3f6a96173a126b264d9 (diff) | |
Merge pull request #12079 from djrm/pr_visual_improvements
Added and improved some missing icons, plus some other visual fixes.
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/color_picker.cpp | 4 | ||||
| -rw-r--r-- | scene/gui/graph_edit.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index e58cbe373b..dbd7c1bbc0 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -40,12 +40,15 @@ void ColorPicker::_notification(int p_what) { switch (p_what) { case NOTIFICATION_THEME_CHANGED: { //sample->set_texture(get_icon("color_sample")); + btn_pick->set_icon(get_icon("screen_picker", "ColorPicker")); + bt_add_preset->set_icon(get_icon("add_preset")); _update_controls(); } break; case NOTIFICATION_ENTER_TREE: { btn_pick->set_icon(get_icon("screen_picker", "ColorPicker")); + bt_add_preset->set_icon(get_icon("add_preset")); _update_color(); } break; @@ -601,7 +604,6 @@ ColorPicker::ColorPicker() preset->connect("draw", this, "_update_presets"); bt_add_preset = memnew(Button); - bt_add_preset->set_icon(get_icon("add_preset")); bt_add_preset->set_tooltip(TTR("Add current color as a preset")); bt_add_preset->connect("pressed", this, "_add_preset_pressed"); bbc->add_child(bt_add_preset); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 0d3cccc2b5..946a8c47a3 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -284,7 +284,6 @@ void GraphEdit::_notification(int p_what) { zoom_reset->set_icon(get_icon("reset")); zoom_plus->set_icon(get_icon("more")); snap_button->set_icon(get_icon("snap")); - //zoom_icon->set_texture( get_icon("Zoom", "EditorIcons")); } if (p_what == NOTIFICATION_DRAW) { |