Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #47697 from gongpha/color-picker-bars-fix-raw-mode

Browse source 
Fix ColorPicker's RGB bars are show in RAW mode and other
This commit is contained in:
Rémi Verschelde 2021-04-08 16:32:38 +02:00 • committed by GitHub
commit 35066f39ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
scene/gui/color_picker.cpp
View file

@ -115,19 +115,22 @@ void ColorPicker::_update_controls() {
if (raw_mode_enabled) {
for (int i = 0; i < 3; i++) {
scroll[i]->add_theme_icon_override("grabber", Ref<Texture2D>());
scroll[i]->add_theme_icon_override("grabber_highlight", Ref<Texture2D>());
scroll[i]->add_theme_style_override("slider", Ref<StyleBox>());
scroll[i]->add_theme_style_override("grabber_area", Ref<StyleBox>());
scroll[i]->add_theme_style_override("grabber_area_highlight", Ref<StyleBox>());
scroll[i]->remove_theme_icon_override("grabber");
scroll[i]->remove_theme_icon_override("grabber_highlight");
scroll[i]->remove_theme_style_override("slider");
scroll[i]->remove_theme_style_override("grabber_area");
scroll[i]->remove_theme_style_override("grabber_area_highlight");
}
} else {
for (int i = 0; i < 3; i++) {
scroll[i]->add_theme_icon_override("grabber", get_theme_icon("bar_arrow"));
scroll[i]->add_theme_icon_override("grabber_highlight", get_theme_icon("bar_arrow"));
scroll[i]->add_theme_style_override("slider", Ref<StyleBoxEmpty>(memnew(StyleBoxEmpty)));
scroll[i]->add_theme_style_override("grabber_area", Ref<StyleBoxEmpty>(memnew(StyleBoxEmpty)));
scroll[i]->add_theme_style_override("grabber_area_highlight", Ref<StyleBoxEmpty>(memnew(StyleBoxEmpty)));
Ref<StyleBoxEmpty> style_box_empty(memnew(StyleBoxEmpty));
Ref<Texture2D> bar_arrow = get_theme_icon("bar_arrow");
for (int i = 0; i < 4; i++) {
scroll[i]->add_theme_icon_override("grabber", bar_arrow);
scroll[i]->add_theme_icon_override("grabber_highlight", bar_arrow);
scroll[i]->add_theme_style_override("slider", style_box_empty);
scroll[i]->add_theme_style_override("grabber_area", style_box_empty);
scroll[i]->add_theme_style_override("grabber_area_highlight", style_box_empty);
}
}
@ -887,12 +890,8 @@ ColorPicker::ColorPicker() :
vbr->add_child(hbc);
}
labels[3]->set_text("A");
scroll[3]->add_theme_icon_override("grabber", get_theme_icon("bar_arrow"));
scroll[3]->add_theme_icon_override("grabber_highlight", get_theme_icon("bar_arrow"));
scroll[3]->add_theme_style_override("slider", Ref<StyleBoxEmpty>(memnew(StyleBoxEmpty)));
scroll[3]->add_theme_style_override("grabber_area", Ref<StyleBoxEmpty>(memnew(StyleBoxEmpty)));
scroll[3]->add_theme_style_override("grabber_area_highlight", Ref<StyleBoxEmpty>(memnew(StyleBoxEmpty)));
HBoxContainer *hhb = memnew(HBoxContainer);
vbr->add_child(hhb);