summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--platform/x11/godot_x11.cpp1
-rw-r--r--scene/gui/tab_container.cpp775
-rw-r--r--scene/gui/tab_container.h7
-rw-r--r--scene/gui/tabs.cpp42
-rw-r--r--scene/gui/tabs.h4
-rw-r--r--scene/resources/default_theme/default_theme.cpp4
-rw-r--r--scene/resources/default_theme/theme_data.h4
-rw-r--r--tools/editor/editor_node.cpp33
-rw-r--r--tools/editor/editor_run.cpp8
-rw-r--r--tools/editor/editor_run.h2
10 files changed, 416 insertions, 464 deletions
diff --git a/platform/x11/godot_x11.cpp b/platform/x11/godot_x11.cpp
index b727ecbd17..adb919c2f1 100644
--- a/platform/x11/godot_x11.cpp
+++ b/platform/x11/godot_x11.cpp
@@ -28,6 +28,7 @@
/*************************************************************************/
#include <unistd.h>
#include <limits.h>
+#include <stdlib.h>
#include "main/main.h"
#include "os_x11.h"
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index a15c9f5e42..1707676da2 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -31,368 +31,322 @@
#include "message_queue.h"
-
int TabContainer::_get_top_margin() const {
+ if (!tabs_visible)
+ return 0;
+
+ // Respect the minimum tab height.
Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
- Ref<Font> font = get_font("font");
+ Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
- int h = MAX( tab_bg->get_minimum_size().height,tab_fg->get_minimum_size().height);
+ int tab_height = MAX(MAX(tab_bg->get_minimum_size().height, tab_fg->get_minimum_size().height), tab_disabled->get_minimum_size().height);
- int ch = font->get_height();
- for(int i=0;i<get_child_count();i++) {
+ // Font height or higher icon wins.
+ Ref<Font> font = get_font("font");
+ int content_height = font->get_height();
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
+ Vector<Control*> tabs = _get_tabs();
+ for (int i = 0; i < tabs.size(); i++) {
+
+ Control *c = tabs[i];
if (!c->has_meta("_tab_icon"))
continue;
Ref<Texture> tex = c->get_meta("_tab_icon");
if (!tex.is_valid())
continue;
- ch = MAX( ch, tex->get_size().height );
+ content_height = MAX(content_height, tex->get_size().height);
}
- h+=ch;
-
- return h;
-
+ return tab_height + content_height;
}
void TabContainer::_gui_input(const InputEvent& p_event) {
- if (p_event.type==InputEvent::MOUSE_BUTTON &&
- p_event.mouse_button.pressed &&
- p_event.mouse_button.button_index==BUTTON_LEFT) {
+ if (p_event.type == InputEvent::MOUSE_BUTTON
+ && p_event.mouse_button.pressed
+ && p_event.mouse_button.button_index == BUTTON_LEFT) {
- // clicks
- Point2 pos( p_event.mouse_button.x, p_event.mouse_button.y );
+ Point2 pos(p_event.mouse_button.x, p_event.mouse_button.y);
+ Size2 size = get_size();
- int top_margin = _get_top_margin();
- if (pos.y>top_margin)
- return; // no click (too far down)
-
- if (pos.x<tabs_ofs_cache)
- return; // no click (too far left)
+ // Click must be on tabs in the tab header area.
+ if (pos.x < tabs_ofs_cache || pos.y > _get_top_margin())
+ return;
- Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
- Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
- Ref<Font> font = get_font("font");
- Ref<Texture> incr = get_icon("increment");
- Ref<Texture> decr = get_icon("decrement");
+ // Handle menu button.
Ref<Texture> menu = get_icon("menu");
- Ref<Texture> menu_hl = get_icon("menu_hl");
-
- if (popup && pos.x>get_size().width-menu->get_width()) {
-
-
+ if (popup && pos.x > size.width - menu->get_width()) {
emit_signal("pre_popup_pressed");
- Vector2 pp_pos = get_global_pos();
- pp_pos.x+=get_size().width;
- pp_pos.x-=popup->get_size().width;
- pp_pos.y+=menu->get_height();
- popup->set_global_pos( pp_pos );
+ Vector2 popup_pos = get_global_pos();
+ popup_pos.x += size.width - popup->get_size().width;
+ popup_pos.y += menu->get_height();
+
+ popup->set_global_pos(popup_pos);
popup->popup();
return;
}
- pos.x-=tabs_ofs_cache;
-
- int idx=0;
- int found=-1;
- bool rightroom=false;
-
- for(int i=0;i<get_child_count();i++) {
-
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
-
- if (idx<tab_display_ofs) {
- idx++;
- continue;
- }
-
- if (idx>last_tab_cache) {
- rightroom=true;
- break;
- }
-
- String s = c->has_meta("_tab_name")?String(XL_MESSAGE(String(c->get_meta("_tab_name")))):String(c->get_name());
- int tab_width=font->get_string_size(s).width;
- if (c->has_meta("_tab_icon")) {
- Ref<Texture> icon = c->get_meta("_tab_icon");
- if (icon.is_valid()) {
- tab_width+=icon->get_width();
- if (s!="")
- tab_width+=get_constant("hseparation");
-
- }
- }
-
- if (idx==current) {
-
- tab_width+=tab_fg->get_minimum_size().width;
- } else {
- tab_width+=tab_bg->get_minimum_size().width;
- }
-
- if (pos.x < tab_width) {
-
- found=idx;
- break;
- }
-
- pos.x-=tab_width;
- idx++;
- }
+ Vector<Control*> tabs = _get_tabs();
+ // Handle navigation buttons.
if (buttons_visible_cache) {
-
- if (p_event.mouse_button.x>get_size().width-incr->get_width()) {
- if (rightroom) {
- tab_display_ofs+=1;
+ Ref<Texture> increment = get_icon("increment");
+ Ref<Texture> decrement = get_icon("decrement");
+ if (pos.x > size.width - increment->get_width()) {
+ if (last_tab_cache < tabs.size() - 1) {
+ first_tab_cache += 1;
update();
}
- } else if (p_event.mouse_button.x>get_size().width-incr->get_width()-decr->get_width()) {
-
- if (tab_display_ofs>0) {
- tab_display_ofs-=1;
+ return;
+ } else if (pos.x > size.width - increment->get_width() - decrement->get_width()) {
+ if (first_tab_cache > 0) {
+ first_tab_cache -= 1;
update();
}
-
+ return;
}
}
-
- if (found!=-1) {
-
- set_current_tab(found);
+ // Activate the clicked tab.
+ pos.x -= tabs_ofs_cache;
+ for (int i = first_tab_cache; i <= last_tab_cache; i++) {
+ int tab_width = _get_tab_width(i);
+ if (pos.x < tab_width) {
+ if (!get_tab_disabled(i)) {
+ set_current_tab(i);
+ }
+ break;
+ }
+ pos.x -= tab_width;
}
}
-
}
void TabContainer::_notification(int p_what) {
-
- switch(p_what) {
-
+ switch (p_what) {
case NOTIFICATION_DRAW: {
- RID ci = get_canvas_item();
- Ref<StyleBox> panel = get_stylebox("panel");
+ RID canvas = get_canvas_item();
Size2 size = get_size();
+ // Draw only the tab area if the header is hidden.
+ Ref<StyleBox> panel = get_stylebox("panel");
if (!tabs_visible) {
-
- panel->draw(ci, Rect2( 0, 0, size.width, size.height));
+ panel->draw(canvas, Rect2(0, 0, size.width, size.height));
return;
}
-
-
+ Vector<Control*> tabs = _get_tabs();
Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
- Ref<Texture> incr = get_icon("increment");
- Ref<Texture> decr = get_icon("decrement");
+ Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
+ Ref<Texture> increment = get_icon("increment");
+ Ref<Texture> decrement = get_icon("decrement");
Ref<Texture> menu = get_icon("menu");
Ref<Texture> menu_hl = get_icon("menu_hl");
Ref<Font> font = get_font("font");
- Color color_fg = get_color("font_color_fg");
- Color color_bg = get_color("font_color_bg");
-
+ Color font_color_fg = get_color("font_color_fg");
+ Color font_color_bg = get_color("font_color_bg");
+ Color font_color_disabled = get_color("font_color_disabled");
int side_margin = get_constant("side_margin");
- int top_margin = _get_top_margin();
-
-
- Size2 top_size = Size2( size.width, top_margin );
-
-
-
- int w=0;
- int idx=0;
- Vector<int> offsets;
- Vector<Control*> controls;
- int from=0;
- int limit=get_size().width;
- if (popup) {
- top_size.width-=menu->get_width();
- limit-=menu->get_width();
- }
-
- bool notdone=false;
- last_tab_cache=-1;
-
- for(int i=0;i<get_child_count();i++) {
-
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
- if (idx<tab_display_ofs) {
- idx++;
- from=idx;
- continue;
- }
-
- if (w>=get_size().width) {
- buttons_visible_cache=true;
- notdone=true;
+ int icon_text_distance = get_constant("hseparation");
+
+ // Find out start and width of the header area.
+ int header_x = side_margin;
+ int header_width = size.width - side_margin * 2;
+ int header_height = _get_top_margin();
+ if (popup)
+ header_width -= menu->get_width();
+
+ // Check if all tabs would fit into the header area.
+ int all_tabs_width = 0;
+ for (int i = 0; i < tabs.size(); i++) {
+ int tab_width = _get_tab_width(i);
+ all_tabs_width += tab_width;
+
+ if (all_tabs_width > header_width) {
+ // Not all tabs are visible at the same time - reserve space for navigation buttons.
+ buttons_visible_cache = true;
+ header_width -= decrement->get_width() + increment->get_width();
break;
- }
-
- offsets.push_back(w);
- controls.push_back(c);
-
- String s = c->has_meta("_tab_name")?String(XL_MESSAGE(String(c->get_meta("_tab_name")))):String(c->get_name());
- w+=font->get_string_size(s).width;
- if (c->has_meta("_tab_icon")) {
- Ref<Texture> icon = c->get_meta("_tab_icon");
- if (icon.is_valid()) {
- w+=icon->get_width();
- if (s!="")
- w+=get_constant("hseparation");
-
- }
- }
-
- if (idx==current) {
-
- w+=tab_fg->get_minimum_size().width;
} else {
- w+=tab_bg->get_minimum_size().width;
+ buttons_visible_cache = false;
}
-
- if (idx<tab_display_ofs) {
-
- }
- last_tab_cache=idx;
-
- idx++;
+ }
+ // With buttons, a right side margin does not need to be respected.
+ if (popup || buttons_visible_cache) {
+ header_width += side_margin;
}
+ // Go through the visible tabs to find the width they occupy.
+ all_tabs_width = 0;
+ Vector<int> tab_widths;
+ for (int i = first_tab_cache; i < tabs.size(); i++) {
+ int tab_width = _get_tab_width(i);
+ if (all_tabs_width + tab_width > header_width && tab_widths.size() > 0)
+ break;
+ all_tabs_width += tab_width;
+ tab_widths.push_back(tab_width);
+ }
- int ofs;
-
- switch(align) {
-
- case ALIGN_LEFT: ofs = side_margin; break;
- case ALIGN_CENTER: ofs = (int(limit) - w)/2; break;
- case ALIGN_RIGHT: ofs = int(limit) - w - side_margin; break;
- };
-
- tab_display_ofs=0;
-
-
- tabs_ofs_cache=ofs;
- idx=0;
-
-
-
- for(int i=0;i<controls.size();i++) {
-
- idx=i+from;
- if (current>=from && current<from+controls.size()-1) {
- //current is visible! draw it last.
- if (i==controls.size()-1) {
- idx=current;
- } else if (idx>=current) {
- idx+=1;
- }
- }
-
- Control *c = controls[idx-from];
-
- String s = c->has_meta("_tab_name")?String(c->get_meta("_tab_name")):String(c->get_name());
- int w=font->get_string_size(s).width;
- Ref<Texture> icon;
- if (c->has_meta("_tab_icon")) {
- icon = c->get_meta("_tab_icon");
- if (icon.is_valid()) {
-
- w+=icon->get_width();
- if (s!="")
- w+=get_constant("hseparation");
-
- }
- }
-
-
- Ref<StyleBox> sb;
- Color col;
-
- if (idx==current) {
+ // Find the offset at which to draw tabs, according to the alignment.
+ switch (align) {
+ case ALIGN_LEFT:
+ tabs_ofs_cache = header_x;
+ break;
+ case ALIGN_CENTER:
+ tabs_ofs_cache = header_x + (header_width / 2) - (all_tabs_width / 2);
+ break;
+ case ALIGN_RIGHT:
+ tabs_ofs_cache = header_x + header_width - all_tabs_width;
+ break;
+ }
- sb=tab_fg;
- col=color_fg;
+ // Draw all visible tabs.
+ int x = 0;
+ for (int i = 0; i < tab_widths.size(); i++) {
+ Ref<StyleBox> tab_style;
+ Color font_color;
+ if (get_tab_disabled(i + first_tab_cache)) {
+ tab_style = tab_disabled;
+ font_color = font_color_disabled;
+ } else if (i + first_tab_cache == current) {
+ tab_style = tab_fg;
+ font_color = font_color_fg;
} else {
- sb=tab_bg;
- col=color_bg;
+ tab_style = tab_bg;
+ font_color = font_color_bg;
}
- int lofs = ofs + offsets[idx-from];
-
- Size2i sb_ms = sb->get_minimum_size();
- Rect2 sb_rect = Rect2( lofs, 0, w+sb_ms.width, top_margin);
+ // Draw the tab background.
+ int tab_width = tab_widths[i];
+ Rect2 tab_rect(tabs_ofs_cache + x, 0, tab_width, header_height);
+ tab_style->draw(canvas, tab_rect);
+ // Draw the tab contents.
+ Control *control = tabs[i + first_tab_cache]->cast_to<Control>();
+ String text = control->has_meta("_tab_name")
+ ? String(XL_MESSAGE(String(control->get_meta("_tab_name"))))
+ : String(control->get_name());
- sb->draw(ci, sb_rect );
-
- Point2i lpos = sb_rect.pos;
- lpos.x+=sb->get_margin(MARGIN_LEFT);
- if (icon.is_valid()) {
-
- icon->draw(ci, Point2i( lpos.x, sb->get_margin(MARGIN_TOP)+((sb_rect.size.y-sb_ms.y)-icon->get_height())/2 ) );
- if (s!="")
- lpos.x+=icon->get_width()+get_constant("hseparation");
+ int x_content = tab_rect.pos.x + tab_style->get_margin(MARGIN_LEFT);
+ int top_margin = tab_style->get_margin(MARGIN_TOP);
+ int y_center = top_margin + (tab_rect.size.y - tab_style->get_minimum_size().y) / 2;
+ // Draw the tab icon.
+ if (control->has_meta("_tab_icon")) {
+ Ref<Texture> icon = control->get_meta("_tab_icon");
+ if (icon.is_valid()) {
+ int y = y_center - (icon->get_height() / 2);
+ icon->draw(canvas, Point2i(x_content, y));
+ if (text != "")
+ x_content += icon->get_width() + icon_text_distance;
+ }
}
- font->draw(ci, Point2i( lpos.x, sb->get_margin(MARGIN_TOP)+((sb_rect.size.y-sb_ms.y)-font->get_height())/2+font->get_ascent() ), s, col );
+ // Draw the tab text.
+ Point2i text_pos(x_content, y_center - (font->get_height() / 2) + font->get_ascent());
+ font->draw(canvas, text_pos, text, font_color);
- idx++;
+ x += tab_width;
+ last_tab_cache = i + first_tab_cache;
}
+ // Draw the popup menu.
+ x = get_size().width;
+ if (popup) {
+ x -= menu->get_width();
+ if (mouse_x_cache > x)
+ menu_hl->draw(get_canvas_item(), Size2(x, 0));
+ else
+ menu->draw(get_canvas_item(), Size2(x, 0));
+ }
+ // Draw the navigation buttons.
if (buttons_visible_cache) {
+ int y_center = header_height / 2;
- int vofs = (top_margin-incr->get_height())/2;
- decr->draw(ci,Point2(limit,vofs),Color(1,1,1,tab_display_ofs==0?0.5:1.0));
- incr->draw(ci,Point2(limit+incr->get_width(),vofs),Color(1,1,1,notdone?1.0:0.5));
- }
-
- if (popup) {
- int from = get_size().width-menu->get_width();
+ x -= increment->get_width();
+ increment->draw(canvas,
+ Point2(x, y_center - (increment->get_height() / 2)),
+ Color(1, 1, 1, last_tab_cache < tabs.size() - 1 ? 1.0 : 0.5));
- if (mouse_x_cache > from)
- menu_hl->draw(get_canvas_item(),Size2(from,0));
- else
- menu->draw(get_canvas_item(),Size2(from,0));
+ x -= decrement->get_width();
+ decrement->draw(canvas,
+ Point2(x, y_center - (decrement->get_height() / 2)),
+ Color(1, 1, 1, first_tab_cache > 0 ? 1.0 : 0.5));
}
- panel->draw(ci, Rect2( 0, top_size.height, size.width, size.height-top_size.height));
-
+ // Draw the tab area.
+ panel->draw(canvas, Rect2(0, header_height, size.width, size.height - header_height));
} break;
case NOTIFICATION_THEME_CHANGED: {
if (get_tab_count() > 0) {
- call_deferred("set_current_tab",get_current_tab()); //wait until all changed theme
+ call_deferred("set_current_tab", get_current_tab()); //wait until all changed theme
}
} break;
}
}
+int TabContainer::_get_tab_width(int p_index) const {
+ Control *control = _get_tabs()[p_index]->cast_to<Control>();
+ if (!control || control->is_set_as_toplevel())
+ return 0;
+
+ // Get the width of the text displayed on the tab.
+ Ref<Font> font = get_font("font");
+ String text = control->has_meta("_tab_name")
+ ? String(XL_MESSAGE(String(control->get_meta("_tab_name"))))
+ : String(control->get_name());
+ int width = font->get_string_size(text).width;
+
+ // Add space for a tab icon.
+ if (control->has_meta("_tab_icon")) {
+ Ref<Texture> icon = control->get_meta("_tab_icon");
+ if (icon.is_valid()) {
+ width += icon->get_width();
+ if (text != "")
+ width += get_constant("hseparation");
+ }
+ }
+
+ // Respect a minimum size.
+ Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
+ Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
+ Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
+ if (get_tab_disabled(p_index)) {
+ width += tab_disabled->get_minimum_size().width;
+ } else if (p_index == current) {
+ width += tab_fg->get_minimum_size().width;
+ } else {
+ width += tab_bg->get_minimum_size().width;
+ }
+
+ return width;
+}
+
+Vector<Control*> TabContainer::_get_tabs() const {
+
+ Vector<Control*> controls;
+ for (int i = 0; i < get_child_count(); i++) {
+
+ Control *control = get_child(i)->cast_to<Control>();
+ if (!control || control->is_toplevel_control())
+ continue;
+
+ controls.push_back(control);
+ }
+ return controls;
+}
+
void TabContainer::_child_renamed_callback() {
update();
@@ -408,78 +362,62 @@ void TabContainer::add_child_notify(Node *p_child) {
if (c->is_set_as_toplevel())
return;
- bool first=false;
+ bool first = false;
- if (get_tab_count()!=1)
+ if (get_tab_count() != 1)
c->hide();
else {
c->show();
//call_deferred("set_current_tab",0);
- first=true;
- current=0;
+ first = true;
+ current = 0;
}
c->set_area_as_parent_rect();
if (tabs_visible)
- c->set_margin(MARGIN_TOP,_get_top_margin());
+ c->set_margin(MARGIN_TOP, _get_top_margin());
Ref<StyleBox> sb = get_stylebox("panel");
- for(int i=0;i<4;i++)
- c->set_margin(Margin(i),c->get_margin(Margin(i))+sb->get_margin(Margin(i)));
+ for (int i = 0; i < 4; i++)
+ c->set_margin(Margin(i), c->get_margin(Margin(i)) + sb->get_margin(Margin(i)));
update();
- p_child->connect("renamed", this,"_child_renamed_callback");
- if(first)
- emit_signal("tab_changed",current);
+ p_child->connect("renamed", this, "_child_renamed_callback");
+ if (first)
+ emit_signal("tab_changed", current);
}
int TabContainer::get_tab_count() const {
- int count=0;
-
- for(int i=0;i<get_child_count();i++) {
-
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- count++;
- }
-
- return count;
+ return _get_tabs().size();
}
void TabContainer::set_current_tab(int p_current) {
- ERR_FAIL_INDEX( p_current, get_tab_count() );
-
- current=p_current;
+ ERR_FAIL_INDEX(p_current, get_tab_count());
- int idx=0;
+ current = p_current;
- Ref<StyleBox> sb=get_stylebox("panel");
- for(int i=0;i<get_child_count();i++) {
+ Ref<StyleBox> sb = get_stylebox("panel");
+ Vector<Control*> tabs = _get_tabs();
+ for (int i = 0; i < tabs.size(); i++) {
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
- if (idx==current) {
+ Control *c = tabs[i];
+ if (i == current) {
c->show();
c->set_area_as_parent_rect();
if (tabs_visible)
- c->set_margin(MARGIN_TOP,_get_top_margin());
- for(int i=0;i<4;i++)
- c->set_margin(Margin(i),c->get_margin(Margin(i))+sb->get_margin(Margin(i)));
+ c->set_margin(MARGIN_TOP, _get_top_margin());
+ for (int i = 0; i < 4; i++)
+ c->set_margin(Margin(i), c->get_margin(Margin(i)) + sb->get_margin(Margin(i)));
} else
c->hide();
- idx++;
}
_change_notify("current_tab");
- emit_signal("tab_changed",current);
+ emit_signal("tab_changed", current);
update();
}
@@ -490,45 +428,19 @@ int TabContainer::get_current_tab() const {
Control* TabContainer::get_tab_control(int p_idx) const {
- int idx=0;
-
-
- for(int i=0;i<get_child_count();i++) {
-
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
- if (idx==p_idx) {
- return c;
-
- }
- idx++;
- }
-
- return NULL;
+ Vector<Control*> tabs = _get_tabs();
+ if (p_idx >= 0 && p_idx < tabs.size())
+ return tabs[p_idx];
+ else
+ return NULL;
}
Control* TabContainer::get_current_tab_control() const {
- int idx=0;
-
-
- for(int i=0;i<get_child_count();i++) {
-
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
- if (idx==current) {
- return c;
-
- }
- idx++;
- }
-
- return NULL;
+ Vector<Control*> tabs = _get_tabs();
+ if (current >= 0 && current < tabs.size())
+ return tabs[current];
+ else
+ return NULL;
}
void TabContainer::remove_child_notify(Node *p_child) {
@@ -536,24 +448,24 @@ void TabContainer::remove_child_notify(Node *p_child) {
Control::remove_child_notify(p_child);
int tc = get_tab_count();
- if (current==tc-1) {
+ if (current == tc - 1) {
current--;
- if (current<0)
- current=0;
+ if (current < 0)
+ current = 0;
else {
- call_deferred("set_current_tab",current);
+ call_deferred("set_current_tab", current);
}
}
- p_child->disconnect("renamed", this,"_child_renamed_callback");
+ p_child->disconnect("renamed", this, "_child_renamed_callback");
update();
}
void TabContainer::set_tab_align(TabAlign p_align) {
- ERR_FAIL_INDEX(p_align,3);
- align=p_align;
+ ERR_FAIL_INDEX(p_align, 3);
+ align = p_align;
update();
_change_notify("tab_align");
@@ -565,20 +477,19 @@ TabContainer::TabAlign TabContainer::get_tab_align() const {
void TabContainer::set_tabs_visible(bool p_visibe) {
- if (p_visibe==tabs_visible)
+ if (p_visibe == tabs_visible)
return;
- tabs_visible=p_visibe;
+ tabs_visible = p_visibe;
- for(int i=0;i<get_child_count();i++) {
+ Vector<Control*> tabs = _get_tabs();
+ for (int i = 0; i < tabs.size(); i++) {
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
+ Control *c = tabs[i];
if (p_visibe)
- c->set_margin(MARGIN_TOP,_get_top_margin());
+ c->set_margin(MARGIN_TOP, _get_top_margin());
else
- c->set_margin(MARGIN_TOP,0);
+ c->set_margin(MARGIN_TOP, 0);
}
update();
@@ -593,36 +504,22 @@ bool TabContainer::are_tabs_visible() const {
Control *TabContainer::_get_tab(int p_idx) const {
- int idx=0;
-
- for(int i=0;i<get_child_count();i++) {
-
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
- if (idx==p_idx)
- return c;
- idx++;
-
- }
- return NULL;
+ return get_tab_control(p_idx);
}
-void TabContainer::set_tab_title(int p_tab,const String& p_title) {
+void TabContainer::set_tab_title(int p_tab, const String& p_title) {
Control *child = _get_tab(p_tab);
ERR_FAIL_COND(!child);
- child->set_meta("_tab_name",p_title);
+ child->set_meta("_tab_name", p_title);
}
-String TabContainer::get_tab_title(int p_tab) const{
+String TabContainer::get_tab_title(int p_tab) const {
Control *child = _get_tab(p_tab);
- ERR_FAIL_COND_V(!child,"");
+ ERR_FAIL_COND_V(!child, "");
if (child->has_meta("_tab_name"))
return child->get_meta("_tab_name");
else
@@ -630,39 +527,53 @@ String TabContainer::get_tab_title(int p_tab) const{
}
-void TabContainer::set_tab_icon(int p_tab,const Ref<Texture>& p_icon){
+void TabContainer::set_tab_icon(int p_tab, const Ref<Texture>& p_icon) {
Control *child = _get_tab(p_tab);
ERR_FAIL_COND(!child);
- child->set_meta("_tab_icon",p_icon);
+ child->set_meta("_tab_icon", p_icon);
}
-Ref<Texture> TabContainer::get_tab_icon(int p_tab) const{
+Ref<Texture> TabContainer::get_tab_icon(int p_tab) const {
Control *child = _get_tab(p_tab);
- ERR_FAIL_COND_V(!child,Ref<Texture>());
+ ERR_FAIL_COND_V(!child, Ref<Texture>());
if (child->has_meta("_tab_icon"))
return child->get_meta("_tab_icon");
else
return Ref<Texture>();
}
+void TabContainer::set_tab_disabled(int p_tab, bool p_enabled) {
+
+ Control *child = _get_tab(p_tab);
+ ERR_FAIL_COND(!child);
+ child->set_meta("_tab_disabled", p_enabled);
+ update();
+}
+bool TabContainer::get_tab_disabled(int p_tab) const {
+
+ Control *child = _get_tab(p_tab);
+ ERR_FAIL_COND_V(!child, false);
+ if (child->has_meta("_tab_disabled"))
+ return child->get_meta("_tab_disabled");
+ else
+ return false;
+}
+
void TabContainer::get_translatable_strings(List<String> *p_strings) const {
- for(int i=0;i<get_child_count();i++) {
+ Vector<Control*> tabs = _get_tabs();
+ for (int i = 0; i < tabs.size(); i++) {
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
+ Control *c = tabs[i];
if (!c->has_meta("_tab_name"))
continue;
String name = c->get_meta("_tab_name");
- if (name!="")
+ if (name != "")
p_strings->push_back(name);
}
}
@@ -672,38 +583,36 @@ Size2 TabContainer::get_minimum_size() const {
Size2 ms;
- for(int i=0;i<get_child_count();i++) {
+ Vector<Control*> tabs = _get_tabs();
+ for (int i = 0; i < tabs.size(); i++) {
- Control *c = get_child(i)->cast_to<Control>();
- if (!c)
- continue;
- if (c->is_set_as_toplevel())
- continue;
+ Control *c = tabs[i];
if (!c->is_visible_in_tree())
continue;
Size2 cms = c->get_combined_minimum_size();
- ms.x=MAX(ms.x,cms.x);
- ms.y=MAX(ms.y,cms.y);
+ ms.x = MAX(ms.x, cms.x);
+ ms.y = MAX(ms.y, cms.y);
}
Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
+ Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
Ref<Font> font = get_font("font");
- ms.y+=MAX(tab_bg->get_minimum_size().y,tab_fg->get_minimum_size().y);
- ms.y+=font->get_height();
+ ms.y += MAX(MAX(tab_bg->get_minimum_size().y, tab_fg->get_minimum_size().y), tab_disabled->get_minimum_size().y);
+ ms.y += font->get_height();
Ref<StyleBox> sb = get_stylebox("panel");
- ms+=sb->get_minimum_size();
+ ms += sb->get_minimum_size();
return ms;
}
void TabContainer::set_popup(Node *p_popup) {
ERR_FAIL_NULL(p_popup);
- popup=p_popup->cast_to<Popup>();
+ popup = p_popup->cast_to<Popup>();
update();
}
@@ -714,43 +623,45 @@ Popup* TabContainer::get_popup() const {
void TabContainer::_bind_methods() {
- ClassDB::bind_method(D_METHOD("_gui_input"),&TabContainer::_gui_input);
- ClassDB::bind_method(D_METHOD("get_tab_count"),&TabContainer::get_tab_count);
- ClassDB::bind_method(D_METHOD("set_current_tab","tab_idx"),&TabContainer::set_current_tab);
- ClassDB::bind_method(D_METHOD("get_current_tab"),&TabContainer::get_current_tab);
- ClassDB::bind_method(D_METHOD("get_current_tab_control:Control"),&TabContainer::get_current_tab_control);
- ClassDB::bind_method(D_METHOD("get_tab_control:Control","idx"),&TabContainer::get_tab_control);
- ClassDB::bind_method(D_METHOD("set_tab_align","align"),&TabContainer::set_tab_align);
- ClassDB::bind_method(D_METHOD("get_tab_align"),&TabContainer::get_tab_align);
- ClassDB::bind_method(D_METHOD("set_tabs_visible","visible"),&TabContainer::set_tabs_visible);
- ClassDB::bind_method(D_METHOD("are_tabs_visible"),&TabContainer::are_tabs_visible);
- ClassDB::bind_method(D_METHOD("set_tab_title","tab_idx","title"),&TabContainer::set_tab_title);
- ClassDB::bind_method(D_METHOD("get_tab_title","tab_idx"),&TabContainer::get_tab_title);
- ClassDB::bind_method(D_METHOD("set_tab_icon","tab_idx","icon:Texture"),&TabContainer::set_tab_icon);
- ClassDB::bind_method(D_METHOD("get_tab_icon:Texture","tab_idx"),&TabContainer::get_tab_icon);
- ClassDB::bind_method(D_METHOD("set_popup","popup:Popup"),&TabContainer::set_popup);
- ClassDB::bind_method(D_METHOD("get_popup:Popup"),&TabContainer::get_popup);
-
- ClassDB::bind_method(D_METHOD("_child_renamed_callback"),&TabContainer::_child_renamed_callback);
-
- ADD_SIGNAL(MethodInfo("tab_changed",PropertyInfo(Variant::INT,"tab")));
+ ClassDB::bind_method(D_METHOD("_gui_input"), &TabContainer::_gui_input);
+ ClassDB::bind_method(D_METHOD("get_tab_count"), &TabContainer::get_tab_count);
+ ClassDB::bind_method(D_METHOD("set_current_tab", "tab_idx"), &TabContainer::set_current_tab);
+ ClassDB::bind_method(D_METHOD("get_current_tab"), &TabContainer::get_current_tab);
+ ClassDB::bind_method(D_METHOD("get_current_tab_control:Control"), &TabContainer::get_current_tab_control);
+ ClassDB::bind_method(D_METHOD("get_tab_control:Control", "idx"), &TabContainer::get_tab_control);
+ ClassDB::bind_method(D_METHOD("set_tab_align", "align"), &TabContainer::set_tab_align);
+ ClassDB::bind_method(D_METHOD("get_tab_align"), &TabContainer::get_tab_align);
+ ClassDB::bind_method(D_METHOD("set_tabs_visible", "visible"), &TabContainer::set_tabs_visible);
+ ClassDB::bind_method(D_METHOD("are_tabs_visible"), &TabContainer::are_tabs_visible);
+ ClassDB::bind_method(D_METHOD("set_tab_title", "tab_idx", "title"), &TabContainer::set_tab_title);
+ ClassDB::bind_method(D_METHOD("get_tab_title", "tab_idx"), &TabContainer::get_tab_title);
+ ClassDB::bind_method(D_METHOD("set_tab_icon", "tab_idx", "icon:Texture"), &TabContainer::set_tab_icon);
+ ClassDB::bind_method(D_METHOD("get_tab_icon:Texture", "tab_idx"), &TabContainer::get_tab_icon);
+ ClassDB::bind_method(D_METHOD("set_tab_disabled", "tab_idx", "disabled"), &TabContainer::set_tab_disabled);
+ ClassDB::bind_method(D_METHOD("get_tab_disabled", "tab_idx"), &TabContainer::get_tab_disabled);
+ ClassDB::bind_method(D_METHOD("set_popup", "popup:Popup"), &TabContainer::set_popup);
+ ClassDB::bind_method(D_METHOD("get_popup:Popup"), &TabContainer::get_popup);
+
+ ClassDB::bind_method(D_METHOD("_child_renamed_callback"), &TabContainer::_child_renamed_callback);
+
+ ADD_SIGNAL(MethodInfo("tab_changed", PropertyInfo(Variant::INT, "tab")));
ADD_SIGNAL(MethodInfo("pre_popup_pressed"));
- ADD_PROPERTY( PropertyInfo(Variant::INT, "tab_align", PROPERTY_HINT_ENUM,"Left,Center,Right"), "set_tab_align", "get_tab_align") ;
- ADD_PROPERTY( PropertyInfo(Variant::INT, "current_tab", PROPERTY_HINT_RANGE,"-1,4096,1",PROPERTY_USAGE_EDITOR), "set_current_tab", "get_current_tab") ;
- ADD_PROPERTY( PropertyInfo(Variant::BOOL, "tabs_visible"), "set_tabs_visible", "are_tabs_visible") ;
+ ADD_PROPERTY(PropertyInfo(Variant::INT, "tab_align", PROPERTY_HINT_ENUM, "Left,Center,Right"), "set_tab_align", "get_tab_align");
+ ADD_PROPERTY(PropertyInfo(Variant::INT, "current_tab", PROPERTY_HINT_RANGE, "-1,4096,1", PROPERTY_USAGE_EDITOR), "set_current_tab", "get_current_tab");
+ ADD_PROPERTY(PropertyInfo(Variant::BOOL, "tabs_visible"), "set_tabs_visible", "are_tabs_visible");
}
TabContainer::TabContainer() {
- tab_display_ofs=0;
- buttons_visible_cache=false;
- tabs_ofs_cache=0;
- current=0;
- mouse_x_cache=0;
- align=ALIGN_CENTER;
- tabs_visible=true;
- popup=NULL;
+ first_tab_cache = 0;
+ buttons_visible_cache = false;
+ tabs_ofs_cache = 0;
+ current = 0;
+ mouse_x_cache = 0;
+ align = ALIGN_CENTER;
+ tabs_visible = true;
+ popup = NULL;
-}
+} \ No newline at end of file
diff --git a/scene/gui/tab_container.h b/scene/gui/tab_container.h
index 8b6ca7704e..67f631f866 100644
--- a/scene/gui/tab_container.h
+++ b/scene/gui/tab_container.h
@@ -46,7 +46,7 @@ public:
private:
int mouse_x_cache;
- int tab_display_ofs;
+ int first_tab_cache;
int tabs_ofs_cache;
int last_tab_cache;
int current;
@@ -57,6 +57,8 @@ private:
int _get_top_margin() const;
Popup *popup;
+ Vector<Control*> _get_tabs() const;
+ int _get_tab_width(int p_index) const;
protected:
@@ -83,6 +85,9 @@ public:
void set_tab_icon(int p_tab,const Ref<Texture>& p_icon);
Ref<Texture> get_tab_icon(int p_tab) const;
+ void set_tab_disabled(int p_tab, bool p_disabled);
+ bool get_tab_disabled(int p_tab) const;
+
int get_tab_count() const;
void set_current_tab(int p_current);
int get_current_tab() const;
diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp
index ae282165c2..4e07a495ed 100644
--- a/scene/gui/tabs.cpp
+++ b/scene/gui/tabs.cpp
@@ -34,9 +34,10 @@ Size2 Tabs::get_minimum_size() const {
Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
+ Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
Ref<Font> font = get_font("font");
- Size2 ms(0, MAX(tab_bg->get_minimum_size().height, tab_fg->get_minimum_size().height)+font->get_height());
+ Size2 ms(0, MAX(MAX(tab_bg->get_minimum_size().height, tab_fg->get_minimum_size().height), tab_disabled->get_minimum_size().height)+font->get_height());
for(int i=0;i<tabs.size();i++) {
@@ -49,7 +50,9 @@ Size2 Tabs::get_minimum_size() const {
ms.width+=font->get_string_size(tabs[i].text).width;
- if (current==i)
+ if (tabs[i].disabled)
+ ms.width += tab_disabled->get_minimum_size().width;
+ else if (current==i)
ms.width+=tab_fg->get_minimum_size().width;
else
ms.width+=tab_bg->get_minimum_size().width;
@@ -111,7 +114,7 @@ void Tabs::_gui_input(const InputEvent& p_event) {
hover_buttons = i;
break;
}
- else if (tabs[i].cb_rect.has_point(pos)) {
+ else if (!tabs[i].disabled && tabs[i].cb_rect.has_point(pos)) {
cb_hover=i;
rb_hover=-1;
hover_buttons = i;
@@ -206,7 +209,9 @@ void Tabs::_gui_input(const InputEvent& p_event) {
}
if (pos.x >=tabs[i].ofs_cache && pos.x<tabs[i].ofs_cache+tabs[i].size_cache) {
- found=i;
+ if (!tabs[i].disabled) {
+ found = i;
+ }
break;
}
}
@@ -242,9 +247,11 @@ void Tabs::_notification(int p_what) {
Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
+ Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
Ref<Font> font = get_font("font");
Color color_fg = get_color("font_color_fg");
Color color_bg = get_color("font_color_bg");
+ Color color_disabled = get_color("font_color_disabled");
Ref<Texture> close=get_icon("close");
int h = get_size().height;
@@ -301,7 +308,10 @@ void Tabs::_notification(int p_what) {
Ref<StyleBox> sb;
Color col;
- if (i==current) {
+ if (tabs[i].disabled) {
+ sb = tab_disabled;
+ col = color_disabled;
+ } else if (i == current) {
sb=tab_fg;
col=color_fg;
} else {
@@ -366,7 +376,7 @@ void Tabs::_notification(int p_what) {
cb_rect.pos.x=w;
cb_rect.pos.y=sb->get_margin(MARGIN_TOP)+((sb_rect.size.y-sb_ms.y)-(cb_rect.size.y))/2;
- if (cb_hover==i) {
+ if (!tabs[i].disabled && cb_hover == i) {
if (cb_pressing)
get_stylebox("button_pressed")->draw(ci,cb_rect);
else
@@ -463,6 +473,18 @@ Ref<Texture> Tabs::get_tab_icon(int p_tab) const{
}
+void Tabs::set_tab_disabled(int p_tab, bool p_disabled) {
+
+ ERR_FAIL_INDEX(p_tab, tabs.size());
+ tabs[p_tab].disabled = p_disabled;
+ update();
+}
+bool Tabs::get_tab_disabled(int p_tab) const {
+
+ ERR_FAIL_INDEX_V(p_tab, tabs.size(), false);
+ return tabs[p_tab].disabled;
+}
+
void Tabs::set_tab_right_button(int p_tab,const Ref<Texture>& p_right_button){
ERR_FAIL_INDEX(p_tab,tabs.size());
@@ -484,6 +506,7 @@ void Tabs::add_tab(const String& p_str,const Ref<Texture>& p_icon) {
Tab t;
t.text=p_str;
t.icon=p_icon;
+ t.disabled = false;
tabs.push_back(t);
@@ -534,6 +557,7 @@ int Tabs::get_tab_width(int p_idx) const {
Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
+ Ref<StyleBox> tab_disabled = get_stylebox("tab_disabled");
Ref<Font> font = get_font("font");
@@ -549,7 +573,9 @@ int Tabs::get_tab_width(int p_idx) const {
x+=font->get_string_size(tabs[p_idx].text).width;
- if (current==p_idx)
+ if (tabs[p_idx].disabled)
+ x += tab_disabled->get_minimum_size().width;
+ else if (current==p_idx)
x+=tab_fg->get_minimum_size().width;
else
x+=tab_bg->get_minimum_size().width;
@@ -657,6 +683,8 @@ void Tabs::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_tab_title","tab_idx"),&Tabs::get_tab_title);
ClassDB::bind_method(D_METHOD("set_tab_icon","tab_idx","icon:Texture"),&Tabs::set_tab_icon);
ClassDB::bind_method(D_METHOD("get_tab_icon:Texture","tab_idx"),&Tabs::get_tab_icon);
+ ClassDB::bind_method(D_METHOD("set_tab_disabled", "tab_idx", "disabled"), &Tabs::set_tab_disabled);
+ ClassDB::bind_method(D_METHOD("get_tab_disabled", "tab_idx"), &Tabs::get_tab_disabled);
ClassDB::bind_method(D_METHOD("remove_tab","tab_idx"),&Tabs::remove_tab);
ClassDB::bind_method(D_METHOD("add_tab","title","icon:Texture"),&Tabs::add_tab);
ClassDB::bind_method(D_METHOD("set_tab_align","align"),&Tabs::set_tab_align);
diff --git a/scene/gui/tabs.h b/scene/gui/tabs.h
index 9ba32297dc..83dcce2613 100644
--- a/scene/gui/tabs.h
+++ b/scene/gui/tabs.h
@@ -57,6 +57,7 @@ private:
String text;
Ref<Texture> icon;
int ofs_cache;
+ bool disabled;
int size_cache;
int x_cache;
int x_size_cache;
@@ -105,6 +106,9 @@ public:
void set_tab_icon(int p_tab,const Ref<Texture>& p_icon);
Ref<Texture> get_tab_icon(int p_tab) const;
+
+ void set_tab_disabled(int p_tab, bool p_disabled);
+ bool get_tab_disabled(int p_tab) const;
void set_tab_right_button(int p_tab,const Ref<Texture>& p_right_button);
Ref<Texture> get_tab_right_button(int p_tab) const;
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 50c6a6c725..feae58d28a 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -750,6 +750,7 @@ void fill_default_theme(Ref<Theme>& t, const Ref<Font> & default_font, const Ref
t->set_stylebox("tab_fg","TabContainer", sb_expand( make_stylebox( tab_current_png,4,4,4,1,16,4,16,4),2,2,2,2) );
t->set_stylebox("tab_bg","TabContainer", sb_expand( make_stylebox( tab_behind_png,5,5,5,1,16,6,16,4),3,0,3,3) );
+ t->set_stylebox("tab_disabled", "TabContainer", sb_expand(make_stylebox(tab_disabled_png, 5, 5, 5, 1, 16, 6, 16, 4), 3, 0, 3, 3));
t->set_stylebox("panel","TabContainer", tc_sb );
t->set_icon("increment","TabContainer",make_icon( scroll_button_right_png));
@@ -763,6 +764,7 @@ void fill_default_theme(Ref<Theme>& t, const Ref<Font> & default_font, const Ref
t->set_color("font_color_fg","TabContainer", control_font_color_hover );
t->set_color("font_color_bg","TabContainer", control_font_color_low );
+ t->set_color("font_color_disabled", "TabContainer", control_font_color_disabled);
t->set_constant("side_margin","TabContainer", 8 *scale);
t->set_constant("top_margin","TabContainer", 24 *scale);
@@ -776,6 +778,7 @@ void fill_default_theme(Ref<Theme>& t, const Ref<Font> & default_font, const Ref
t->set_stylebox("tab_fg","Tabs", sb_expand( make_stylebox( tab_current_png,4,3,4,1,16,3,16,2),2,2,2,2) );
t->set_stylebox("tab_bg","Tabs", sb_expand( make_stylebox( tab_behind_png,5,4,5,1,16,5,16,2),3,3,3,3) );
+ t->set_stylebox("tab_disabled", "Tabs", sb_expand(make_stylebox(tab_disabled_png, 5, 4, 5, 1, 16, 5, 16, 2), 3, 3, 3, 3));
t->set_stylebox("panel","Tabs",tc_sb );
t->set_stylebox("button_pressed","Tabs", make_stylebox( button_pressed_png,4,4,4,4) );
t->set_stylebox("button","Tabs", make_stylebox( button_normal_png,4,4,4,4) );
@@ -790,6 +793,7 @@ void fill_default_theme(Ref<Theme>& t, const Ref<Font> & default_font, const Ref
t->set_color("font_color_fg","Tabs", control_font_color_hover );
t->set_color("font_color_bg","Tabs", control_font_color_low );
+ t->set_color("font_color_disabled", "Tabs", control_font_color_disabled);
t->set_constant("top_margin","Tabs", 24 *scale);
t->set_constant("label_valign_fg","Tabs", 0 *scale);
diff --git a/scene/resources/default_theme/theme_data.h b/scene/resources/default_theme/theme_data.h
index 5b5868ba14..394cfaf424 100644
--- a/scene/resources/default_theme/theme_data.h
+++ b/scene/resources/default_theme/theme_data.h
@@ -458,6 +458,10 @@ static const unsigned char tab_current_png[]={
0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x9c,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f,0x3d,0x48,0x5b,0x58,0x66,0x5b,0x57,0x65,0x57,0x54,0x62,0x55,0x53,0x62,0x4a,0x46,0x52,0x46,0x41,0x4e,0x45,0x41,0x4d,0x55,0x52,0x60,0x44,0x41,0x4c,0x53,0x50,0x5e,0x43,0x40,0x4b,0x52,0x4e,0x5d,0x41,0x3e,0x4a,0x4f,0x4d,0x5a,0x3f,0x3d,0x48,0x4e,0x4b,0x59,0x3e,0x3c,0x47,0x4d,0x4a,0x58,0x3d,0x3b,0x46,0x4b,0x49,0x54,0x3c,0x3a,0x44,0x4b,0x47,0x54,0x3b,0x39,0x43,0x3b,0x39,0x42,0x3b,0x38,0x43,0x3b,0x38,0x42,0x3a,0x37,0x41,0x39,0x37,0x41,0x3a,0x38,0x41,0x39,0x36,0x3f,0x38,0x36,0x3f,0x39,0x36,0x40,0x38,0x36,0x40,0x37,0x35,0x3e,0x37,0x34,0x3e,0x36,0x35,0x3d,0x35,0x32,0x3b,0x59,0xdd,0xd3,0xff,0x0,0x0,0x0,0x11,0x74,0x52,0x4e,0x53,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x77,0xef,0xef,0xa3,0x31,0x6b,0xc2,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x33,0x37,0xd5,0x7c,0x5e,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xa2,0x49,0x44,0x41,0x54,0x18,0xd3,0x45,0xcd,0xd9,0x12,0x82,0x30,0xc,0x40,0xd1,0x0,0x2d,0x4b,0x5b,0x36,0x59,0x44,0x44,0x44,0xa4,0x68,0x59,0x54,0xfc,0xff,0x8f,0x33,0x30,0x4c,0x3d,0x93,0xa7,0x3b,0x93,0x4,0xc0,0x30,0x2d,0x42,0x6d,0x44,0x89,0x65,0x1a,0x0,0x86,0xe3,0x7a,0x8c,0xb,0xdf,0x17,0x9c,0x79,0xae,0x63,0x80,0xe9,0x6,0x61,0x7c,0xd8,0xc4,0x61,0xe0,0x9a,0x60,0x79,0x51,0x92,0x66,0x9b,0x34,0x89,0x3c,0xb,0x8,0xcb,0xb3,0xe3,0x2e,0xcb,0x19,0x1,0xca,0x8b,0x93,0x56,0x70,0xa,0xb6,0x28,0xcf,0x5a,0x29,0x6c,0xb0,0xfd,0xea,0xa2,0x55,0xfe,0x1a,0xea,0xab,0x56,0xaf,0x41,0x34,0x37,0xad,0xc1,0x15,0xca,0xdb,0xbb,0xd6,0xe2,0x51,0xc2,0xba,0x7f,0xe8,0xf0,0x2d,0x6,0x29,0xfb,0x5e,0xca,0xc7,0x53,0xca,0x3d,0xa8,0x61,0x50,0xc3,0xa8,0xc6,0x41,0xed,0x61,0x9a,0xa6,0x19,0xbd,0xe6,0xf7,0x1e,0x3e,0xcb,0x82,0x83,0xbe,0x18,0x7e,0xa1,0xe5,0x17,0x1f,0xcf,0x5d,0x82,0x6b,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
+static const unsigned char tab_disabled_png[] = {
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x12,0x0,0x0,0xb,0x12,0x1,0xd2,0xdd,0x7e,0xfc,0x0,0x0,0x0,0xd2,0x49,0x44,0x41,0x54,0x38,0xcb,0xd5,0x90,0x51,0xa,0xc2,0x30,0xc,0x86,0xd3,0x2e,0xdb,0x4,0x1f,0xb6,0x57,0x75,0x77,0xd9,0x1d,0x3c,0x8d,0x47,0xd8,0x69,0xbc,0x81,0xf,0xbb,0xcb,0xf0,0x6d,0xa8,0xa0,0xa0,0x6b,0xd7,0x9a,0x40,0x26,0xa,0xdb,0x98,0x22,0x88,0x81,0xf,0x92,0xf2,0xe7,0x4f,0x13,0x5,0x0,0x48,0x44,0x44,0x4c,0xcc,0x24,0xf,0x8,0xd,0xaf,0xe1,0x88,0x96,0x68,0x88,0x2b,0x71,0xe3,0xbc,0x6b,0x9e,0x13,0x29,0x91,0x48,0xce,0x66,0x4a,0xe0,0xf0,0x2,0x37,0x5d,0x88,0x13,0x71,0x4,0x99,0xce,0xe2,0x34,0xcf,0xf3,0x75,0xb6,0xcc,0xa,0xd3,0x1a,0x18,0x8b,0x30,0x8,0xa1,0xda,0x57,0x9b,0xb2,0x2c,0xb7,0x54,0x5a,0x94,0x6f,0x27,0xab,0xc5,0xaa,0xa8,0xf,0x35,0x58,0x6b,0xc1,0x7b,0xdf,0xdb,0xac,0x94,0x2,0x44,0x4,0xd6,0x52,0xb9,0x23,0xce,0x8f,0x15,0x1a,0xdb,0x80,0x31,0xe3,0xd3,0xd9,0x98,0x35,0xac,0x95,0x55,0x23,0x2d,0x7,0x8b,0x87,0xa6,0xe,0x19,0xc9,0xea,0x1,0xca,0xb5,0x15,0x3f,0x4e,0x35,0x11,0x1d,0x1f,0x58,0x63,0xb7,0xde,0x87,0x6,0x80,0xcf,0x8f,0x6f,0x1a,0xc0,0x77,0xd,0x9c,0x73,0x93,0xd,0x58,0xdb,0x85,0xee,0x73,0xfd,0xcd,0xa,0xff,0x6b,0x70,0x7,0xd6,0xd5,0x90,0x3b,0x10,0xe9,0x51,0x80,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+};
+
static const unsigned char tab_menu_png[]={
0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x6f,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0x18,0x5,0xa3,0x80,0x81,0x81,0x11,0x5d,0xe0,0xc1,0x83,0x7,0xff,0xf1,0x69,0x50,0x50,0x50,0x40,0xd1,0xc3,0x44,0xa9,0xb,0xa8,0x6f,0x0,0x23,0x23,0x63,0x3c,0x3,0x3,0xc3,0x57,0x2c,0x6a,0xbf,0x33,0x32,0x32,0xa6,0x63,0xa8,0xc7,0x66,0xea,0xfd,0xfb,0xf7,0x35,0x18,0x18,0x18,0x56,0x31,0x32,0x32,0xea,0x42,0x85,0x6e,0x30,0x33,0x33,0x87,0xc9,0xca,0xca,0x5e,0x26,0xca,0x0,0x6,0x6,0x6,0x86,0x17,0x2f,0x5e,0x70,0xff,0xfc,0xf9,0x73,0xa,0x3,0x3,0x3,0x3,0x3b,0x3b,0x7b,0x8e,0x84,0x84,0x4,0x36,0x57,0xd,0x2,0x0,0x0,0x67,0xf2,0x14,0xc2,0xc2,0xbe,0xf5,0xb5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 5e2d6e7d6b..7a85941b0d 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -1792,7 +1792,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
play_custom_scene_button->set_pressed(false);
play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom","EditorIcons"));
- String current_filename;
+ String main_scene;
String run_filename;
String args;
@@ -1819,25 +1819,16 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
}
-
-
- if (run_settings_dialog->get_run_mode()==RunSettingsDialog::RUN_LOCAL_SCENE) {
-
- run_filename=scene->get_filename();
- } else {
- current_filename=scene->get_filename();
- }
-
+ run_filename=scene->get_filename();
} else if (p_custom!="") {
-
- run_filename=p_custom;
+ run_filename = p_custom;
}
if (run_filename=="") {
//evidently, run the scene
- run_filename=GLOBAL_DEF("application/main_scene","");
- if (run_filename=="") {
+ main_scene=GLOBAL_DEF("application/main_scene","");
+ if (main_scene=="") {
current_option=-1;
//accept->get_cancel()->hide();
@@ -1846,21 +1837,21 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
return;
}
- if (!FileAccess::exists(run_filename)) {
+ if (!FileAccess::exists(main_scene)) {
current_option=-1;
//accept->get_cancel()->hide();
- pick_main_scene->set_text(vformat(TTR("Selected scene '%s' does not exist, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), run_filename));
+ pick_main_scene->set_text(vformat(TTR("Selected scene '%s' does not exist, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), main_scene));
pick_main_scene->popup_centered_minsize();
return;
}
- if (ResourceLoader::get_resource_type(run_filename)!="PackedScene") {
+ if (ResourceLoader::get_resource_type(main_scene)!="PackedScene") {
current_option=-1;
//accept->get_cancel()->hide();
- pick_main_scene->set_text(vformat(TTR("Selected scene '%s' is not a scene file, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), run_filename));
+ pick_main_scene->set_text(vformat(TTR("Selected scene '%s' is not a scene file, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), main_scene));
pick_main_scene->popup_centered_minsize();
return;
@@ -1908,7 +1899,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
args = GlobalConfig::get_singleton()->get("editor/main_run_args");
- Error error = editor_run.run(run_filename,args,breakpoints,current_filename);
+ Error error = editor_run.run(run_filename,args,breakpoints);
if (error!=OK) {
@@ -1926,7 +1917,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
play_scene_button->set_pressed(true);
play_scene_button->set_icon(gui_base->get_icon("Reload","EditorIcons"));
} else if (p_custom!="") {
- run_custom_filename=run_filename;
+ run_custom_filename=p_custom;
play_custom_scene_button->set_pressed(true);
play_custom_scene_button->set_icon(gui_base->get_icon("Reload","EditorIcons"));
} else {
@@ -5224,7 +5215,7 @@ EditorNode::EditorNode() {
register_exporters();
- GLOBAL_DEF("editor/main_run_args","$scene");
+ GLOBAL_DEF("editor/main_run_args","");
ClassDB::set_class_enabled("CollisionShape",true);
ClassDB::set_class_enabled("CollisionShape2D",true);
diff --git a/tools/editor/editor_run.cpp b/tools/editor/editor_run.cpp
index a5d39db6be..46e400ae7f 100644
--- a/tools/editor/editor_run.cpp
+++ b/tools/editor/editor_run.cpp
@@ -35,7 +35,7 @@ EditorRun::Status EditorRun::get_status() const {
return status;
}
-Error EditorRun::run(const String& p_scene,const String p_custom_args,const List<String>& p_breakpoints,const String& p_edited_scene) {
+Error EditorRun::run(const String& p_scene,const String p_custom_args,const List<String>& p_breakpoints) {
List<String> args;
@@ -141,11 +141,15 @@ Error EditorRun::run(const String& p_scene,const String p_custom_args,const List
args.push_back(bpoints);
}
+
+ if (p_scene!="") {
+ args.push_back(p_scene);
+ }
if (p_custom_args!="") {
Vector<String> cargs=p_custom_args.split(" ",false);
for(int i=0;i<cargs.size();i++) {
- args.push_back(cargs[i].replace("$scene",p_scene).replace(" ","%20"));
+ args.push_back(cargs[i].replace(" ","%20"));
}
}
diff --git a/tools/editor/editor_run.h b/tools/editor/editor_run.h
index 78fa892488..46c5dc7521 100644
--- a/tools/editor/editor_run.h
+++ b/tools/editor/editor_run.h
@@ -49,7 +49,7 @@ private:
public:
Status get_status() const;
- Error run(const String& p_scene,const String p_custom_args,const List<String>& p_breakpoints,const String& p_edited_scene);
+ Error run(const String& p_scene,const String p_custom_args,const List<String>& p_breakpoints);
void run_native_notify() { status=STATUS_PLAY; }
void stop();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 00:05:45 +0000