asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MenuBar item order in RTL layout.

Browse source
This commit is contained in:
bruvzg 2023-05-26 17:02:00 +03:00
parent 2f57da2907
commit be42ff0ef4
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/gui/menu_bar.cpp
View file

@ -399,13 +399,18 @@ void MenuBar::_notification(int p_what) {
int MenuBar::_get_index_at_point(const Point2 &p_point) const { int MenuBar::_get_index_at_point(const Point2 &p_point) const {
Ref<StyleBox> style = theme_cache.normal; Ref<StyleBox> style = theme_cache.normal;
int offset = 0; int offset = 0;
Point2 point = p_point;
if (is_layout_rtl()) {
point.x = get_size().x - point.x;
}
for (int i = 0; i < menu_cache.size(); i++) { for (int i = 0; i < menu_cache.size(); i++) {
if (menu_cache[i].hidden) { if (menu_cache[i].hidden) {
continue; continue;
} }
Size2 size = menu_cache[i].text_buf->get_size() + style->get_minimum_size(); Size2 size = menu_cache[i].text_buf->get_size() + style->get_minimum_size();
if (p_point.x > offset && p_point.x < offset + size.x) { if (point.x > offset && point.x < offset + size.x) {
if (p_point.y > 0 && p_point.y < size.y) { if (point.y > 0 && point.y < size.y) {
return i; return i;
} }
} }
@ -428,7 +433,12 @@ Rect2 MenuBar::_get_menu_item_rect(int p_index) const {
offset += size.x + theme_cache.h_separation; offset += size.x + theme_cache.h_separation;
} }
return Rect2(Point2(offset, 0), menu_cache[p_index].text_buf->get_size() + style->get_minimum_size()); Size2 size = menu_cache[p_index].text_buf->get_size() + style->get_minimum_size();
if (is_layout_rtl()) {
return Rect2(Point2(get_size().x - offset - size.x, 0), size);
} else {
return Rect2(Point2(offset, 0), size);
}
} }
void MenuBar::_draw_menu_item(int p_index) { void MenuBar::_draw_menu_item(int p_index) {