diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-17 16:00:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 16:00:42 +0200 |
| commit | b334560f05f86fb2267611c2d8a3f043e34e233e (patch) | |
| tree | e95c63358fb094fe0f2108a2de4e351337236b44 /scene/gui/color_picker.cpp | |
| parent | d67e2f3e0f00c4a78552fabf38dfe816bdeeefe9 (diff) | |
| parent | 4f4c9a5f570bcaf8017cb86f22f45e885a226d07 (diff) | |
| download | redot-engine-b334560f05f86fb2267611c2d8a3f043e34e233e.tar.gz | |
Merge pull request #49376 from menip/OptionButtonFix
Diffstat (limited to 'scene/gui/color_picker.cpp')
| -rw-r--r-- | scene/gui/color_picker.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 1afb0b8e9d..efb6b7d200 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -1308,6 +1308,8 @@ void ColorPickerButton::_modal_closed() { void ColorPickerButton::pressed() { _update_picker(); + Size2 size = get_size() * get_viewport()->get_canvas_transform().get_scale(); + popup->set_as_minsize(); picker->_update_presets(); @@ -1319,13 +1321,13 @@ void ColorPickerButton::pressed() { if (i > 1) { cp_rect.position.y = get_screen_position().y - cp_rect.size.y; } else { - cp_rect.position.y = get_screen_position().y + get_size().height; + cp_rect.position.y = get_screen_position().y + size.height; } if (i & 1) { cp_rect.position.x = get_screen_position().x; } else { - cp_rect.position.x = get_screen_position().x - MAX(0, (cp_rect.size.x - get_size().x)); + cp_rect.position.x = get_screen_position().x - MAX(0, (cp_rect.size.x - size.x)); } if (usable_rect.encloses(cp_rect)) { |