godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved color temperature in script editor

Browse Source
This commit is contained in:
Daniel J. Ramirez 2017-09-03 02:44:59 -05:00
parent ce28452109
commit 215b110cd3
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/script_editor_plugin.cpp
View File

@ -1417,7 +1417,7 @@ void ScriptEditor::_update_script_colors() {
int non_zero_hist_size = (hist_size == 0) ? 1 : hist_size; int non_zero_hist_size = (hist_size == 0) ? 1 : hist_size;
float v = Math::ease((edit_pass - pass) / float(non_zero_hist_size), 0.4); float v = Math::ease((edit_pass - pass) / float(non_zero_hist_size), 0.4);
script_list->set_item_custom_bg_color(i, hot_color.linear_interpolate(cold_color, v)); script_list->set_item_custom_fg_color(i, hot_color.linear_interpolate(cold_color, v));
} }
} }
} }
@ -2506,9 +2506,9 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) {
EDITOR_DEF("text_editor/open_scripts/script_temperature_enabled", true); EDITOR_DEF("text_editor/open_scripts/script_temperature_enabled", true);
EDITOR_DEF("text_editor/open_scripts/highlight_current_script", true); EDITOR_DEF("text_editor/open_scripts/highlight_current_script", true);
EDITOR_DEF("text_editor/open_scripts/script_temperature_history_size", 15); EDITOR_DEF("text_editor/open_scripts/script_temperature_history_size", 15);
EDITOR_DEF("text_editor/open_scripts/script_temperature_hot_color", Color(1, 0, 0, 0.3)); EDITOR_DEF("text_editor/open_scripts/script_temperature_hot_color", Color::html("ed5e5e"));
EDITOR_DEF("text_editor/open_scripts/script_temperature_cold_color", Color(0, 0, 1, 0.3)); EDITOR_DEF("text_editor/open_scripts/script_temperature_cold_color", Color(1, 1, 1, 0.3));
EDITOR_DEF("text_editor/open_scripts/current_script_background_color", Color(0.81, 0.81, 0.14, 0.63)); EDITOR_DEF("text_editor/open_scripts/current_script_background_color", Color(1, 1, 1, 0.5));
EDITOR_DEF("text_editor/open_scripts/group_help_pages", true); EDITOR_DEF("text_editor/open_scripts/group_help_pages", true);
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "text_editor/open_scripts/sort_scripts_by", PROPERTY_HINT_ENUM, "Name,Path")); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "text_editor/open_scripts/sort_scripts_by", PROPERTY_HINT_ENUM, "Name,Path"));
EDITOR_DEF("text_editor/open_scripts/sort_scripts_by", 0); EDITOR_DEF("text_editor/open_scripts/sort_scripts_by", 0);

16
scene/gui/item_list.cpp
View File

@ -151,6 +151,20 @@ Color ItemList::get_item_custom_bg_color(int p_idx) const {
return items[p_idx].custom_bg; return items[p_idx].custom_bg;
} }
void ItemList::set_item_custom_fg_color(int p_idx, const Color &p_custom_fg_color) {
ERR_FAIL_INDEX(p_idx, items.size());
items[p_idx].custom_fg = p_custom_fg_color;
}
Color ItemList::get_item_custom_fg_color(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, items.size(), Color());
return items[p_idx].custom_fg;
}
void ItemList::set_item_tag_icon(int p_idx, const Ref<Texture> &p_tag_icon) { void ItemList::set_item_tag_icon(int p_idx, const Ref<Texture> &p_tag_icon) {
ERR_FAIL_INDEX(p_idx, items.size()); ERR_FAIL_INDEX(p_idx, items.size());
@ -1021,7 +1035,7 @@ void ItemList::_notification(int p_what) {
else else
max_len = size.x; max_len = size.x;
Color modulate = items[i].selected ? font_color_selected : font_color; Color modulate = items[i].selected ? font_color_selected : (items[i].custom_fg != Color() ? items[i].custom_fg : font_color);
if (items[i].disabled) if (items[i].disabled)
modulate.a *= 0.5; modulate.a *= 0.5;

4
scene/gui/item_list.h
View File

@ -61,6 +61,7 @@ private:
bool tooltip_enabled; bool tooltip_enabled;
Variant metadata; Variant metadata;
String tooltip; String tooltip;
Color custom_fg;
Color custom_bg; Color custom_bg;
Rect2 rect_cache; Rect2 rect_cache;
@ -150,6 +151,9 @@ public:
void set_item_custom_bg_color(int p_idx, const Color &p_custom_bg_color); void set_item_custom_bg_color(int p_idx, const Color &p_custom_bg_color);
Color get_item_custom_bg_color(int p_idx) const; Color get_item_custom_bg_color(int p_idx) const;
void set_item_custom_fg_color(int p_idx, const Color &p_custom_fg_color);
Color get_item_custom_fg_color(int p_idx) const;
void select(int p_idx, bool p_single = true); void select(int p_idx, bool p_single = true);
void unselect(int p_idx); void unselect(int p_idx);
bool is_selected(int p_idx) const; bool is_selected(int p_idx) const;