You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-06 12:20:30 +00:00
Popups are now windows also (broken!)
This commit is contained in:
Juan Linietsky
@@ -2284,7 +2284,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
|
||||
}
|
||||
|
||||
selection_menu_additive_selection = b->get_shift();
|
||||
selection_menu->set_global_position(b->get_global_position());
|
||||
selection_menu->set_position(get_screen_transform().xform(b->get_position()));
|
||||
selection_menu->popup();
|
||||
return true;
|
||||
}
|
||||
@@ -2588,9 +2588,9 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
|
||||
}
|
||||
|
||||
void CanvasItemEditor::_draw_text_at_position(Point2 p_position, String p_string, Margin p_side) {
|
||||
Color color = get_color("font_color", "Editor");
|
||||
Color color = get_theme_color("font_color", "Editor");
|
||||
color.a = 0.8;
|
||||
Ref<Font> font = get_font("font", "Label");
|
||||
Ref<Font> font = get_theme_font("font", "Label");
|
||||
Size2 text_size = font->get_string_size(p_string);
|
||||
switch (p_side) {
|
||||
case MARGIN_LEFT:
|
||||
@@ -2626,7 +2626,7 @@ void CanvasItemEditor::_draw_percentage_at_position(float p_value, Point2 p_posi
|
||||
void CanvasItemEditor::_draw_focus() {
|
||||
// Draw the focus around the base viewport
|
||||
if (viewport->has_focus()) {
|
||||
get_stylebox("Focus", "EditorStyles")->draw(viewport->get_canvas_item(), Rect2(Point2(), viewport->get_size()));
|
||||
get_theme_stylebox("Focus", "EditorStyles")->draw(viewport->get_canvas_item(), Rect2(Point2(), viewport->get_size()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2657,18 +2657,18 @@ void CanvasItemEditor::_draw_guides() {
|
||||
}
|
||||
|
||||
// Dragged guide
|
||||
Color text_color = get_color("font_color", "Editor");
|
||||
Color text_color = get_theme_color("font_color", "Editor");
|
||||
text_color.a = 0.5;
|
||||
if (drag_type == DRAG_DOUBLE_GUIDE || drag_type == DRAG_V_GUIDE) {
|
||||
String str = vformat("%d px", Math::round(xform.affine_inverse().xform(dragged_guide_pos).x));
|
||||
Ref<Font> font = get_font("font", "Label");
|
||||
Ref<Font> font = get_theme_font("font", "Label");
|
||||
Size2 text_size = font->get_string_size(str);
|
||||
viewport->draw_string(font, Point2(dragged_guide_pos.x + 10, RULER_WIDTH + text_size.y / 2 + 10), str, text_color);
|
||||
viewport->draw_line(Point2(dragged_guide_pos.x, 0), Point2(dragged_guide_pos.x, viewport->get_size().y), guide_color, Math::round(EDSCALE));
|
||||
}
|
||||
if (drag_type == DRAG_DOUBLE_GUIDE || drag_type == DRAG_H_GUIDE) {
|
||||
String str = vformat("%d px", Math::round(xform.affine_inverse().xform(dragged_guide_pos).y));
|
||||
Ref<Font> font = get_font("font", "Label");
|
||||
Ref<Font> font = get_theme_font("font", "Label");
|
||||
Size2 text_size = font->get_string_size(str);
|
||||
viewport->draw_string(font, Point2(RULER_WIDTH + 10, dragged_guide_pos.y + text_size.y / 2 + 10), str, text_color);
|
||||
viewport->draw_line(Point2(0, dragged_guide_pos.y), Point2(viewport->get_size().x, dragged_guide_pos.y), guide_color, Math::round(EDSCALE));
|
||||
@@ -2690,11 +2690,11 @@ void CanvasItemEditor::_draw_smart_snapping() {
|
||||
}
|
||||
|
||||
void CanvasItemEditor::_draw_rulers() {
|
||||
Color bg_color = get_color("dark_color_2", "Editor");
|
||||
Color graduation_color = get_color("font_color", "Editor").linear_interpolate(bg_color, 0.5);
|
||||
Color font_color = get_color("font_color", "Editor");
|
||||
Color bg_color = get_theme_color("dark_color_2", "Editor");
|
||||
Color graduation_color = get_theme_color("font_color", "Editor").linear_interpolate(bg_color, 0.5);
|
||||
Color font_color = get_theme_color("font_color", "Editor");
|
||||
font_color.a = 0.8;
|
||||
Ref<Font> font = get_font("rulers", "EditorFonts");
|
||||
Ref<Font> font = get_theme_font("rulers", "EditorFonts");
|
||||
|
||||
// The rule transform
|
||||
Transform2D ruler_transform = Transform2D();
|
||||
@@ -2856,7 +2856,7 @@ void CanvasItemEditor::_draw_ruler_tool() {
|
||||
return;
|
||||
|
||||
if (ruler_tool_active) {
|
||||
Color ruler_primary_color = get_color("accent_color", "Editor");
|
||||
Color ruler_primary_color = get_theme_color("accent_color", "Editor");
|
||||
Color ruler_secondary_color = ruler_primary_color;
|
||||
ruler_secondary_color.a = 0.5;
|
||||
|
||||
@@ -2873,8 +2873,8 @@ void CanvasItemEditor::_draw_ruler_tool() {
|
||||
viewport->draw_line(corner, end, ruler_secondary_color, Math::round(EDSCALE));
|
||||
}
|
||||
|
||||
Ref<Font> font = get_font("bold", "EditorFonts");
|
||||
Color font_color = get_color("font_color", "Editor");
|
||||
Ref<Font> font = get_theme_font("bold", "EditorFonts");
|
||||
Color font_color = get_theme_color("font_color", "Editor");
|
||||
Color font_secondary_color = font_color;
|
||||
font_secondary_color.a = 0.5;
|
||||
float text_height = font->get_height();
|
||||
@@ -2974,8 +2974,8 @@ void CanvasItemEditor::_draw_ruler_tool() {
|
||||
} else {
|
||||
|
||||
if (grid_snap_active) {
|
||||
Ref<Texture2D> position_icon = get_icon("EditorPosition", "EditorIcons");
|
||||
viewport->draw_texture(get_icon("EditorPosition", "EditorIcons"), (ruler_tool_origin - view_offset) * zoom - position_icon->get_size() / 2);
|
||||
Ref<Texture2D> position_icon = get_theme_icon("EditorPosition", "EditorIcons");
|
||||
viewport->draw_texture(get_theme_icon("EditorPosition", "EditorIcons"), (ruler_tool_origin - view_offset) * zoom - position_icon->get_size() / 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3187,9 +3187,9 @@ void CanvasItemEditor::_draw_control_helpers(Control *control) {
|
||||
}
|
||||
|
||||
void CanvasItemEditor::_draw_selection() {
|
||||
Ref<Texture2D> pivot_icon = get_icon("EditorPivot", "EditorIcons");
|
||||
Ref<Texture2D> position_icon = get_icon("EditorPosition", "EditorIcons");
|
||||
Ref<Texture2D> previous_position_icon = get_icon("EditorPositionPrevious", "EditorIcons");
|
||||
Ref<Texture2D> pivot_icon = get_theme_icon("EditorPivot", "EditorIcons");
|
||||
Ref<Texture2D> position_icon = get_theme_icon("EditorPosition", "EditorIcons");
|
||||
Ref<Texture2D> previous_position_icon = get_theme_icon("EditorPositionPrevious", "EditorIcons");
|
||||
|
||||
RID ci = viewport->get_canvas_item();
|
||||
|
||||
@@ -3312,16 +3312,16 @@ void CanvasItemEditor::_draw_selection() {
|
||||
points.push_back(Vector2(move_factor.x * EDSCALE, -5 * EDSCALE));
|
||||
points.push_back(Vector2((move_factor.x + 10) * EDSCALE, 0));
|
||||
|
||||
viewport->draw_colored_polygon(points, get_color("axis_x_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(move_factor.x * EDSCALE, 0), get_color("axis_x_color", "Editor"), Math::round(EDSCALE));
|
||||
viewport->draw_colored_polygon(points, get_theme_color("axis_x_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(move_factor.x * EDSCALE, 0), get_theme_color("axis_x_color", "Editor"), Math::round(EDSCALE));
|
||||
|
||||
points.clear();
|
||||
points.push_back(Vector2(5 * EDSCALE, move_factor.y * EDSCALE));
|
||||
points.push_back(Vector2(-5 * EDSCALE, move_factor.y * EDSCALE));
|
||||
points.push_back(Vector2(0, (move_factor.y + 10) * EDSCALE));
|
||||
|
||||
viewport->draw_colored_polygon(points, get_color("axis_y_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(0, move_factor.y * EDSCALE), get_color("axis_y_color", "Editor"), Math::round(EDSCALE));
|
||||
viewport->draw_colored_polygon(points, get_theme_color("axis_y_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(0, move_factor.y * EDSCALE), get_theme_color("axis_y_color", "Editor"), Math::round(EDSCALE));
|
||||
|
||||
viewport->draw_set_transform_matrix(viewport->get_transform());
|
||||
}
|
||||
@@ -3351,12 +3351,12 @@ void CanvasItemEditor::_draw_selection() {
|
||||
|
||||
viewport->draw_set_transform_matrix(simple_xform);
|
||||
Rect2 x_handle_rect = Rect2(scale_factor.x * EDSCALE, -5 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
|
||||
viewport->draw_rect(x_handle_rect, get_color("axis_x_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(scale_factor.x * EDSCALE, 0), get_color("axis_x_color", "Editor"), Math::round(EDSCALE));
|
||||
viewport->draw_rect(x_handle_rect, get_theme_color("axis_x_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(scale_factor.x * EDSCALE, 0), get_theme_color("axis_x_color", "Editor"), Math::round(EDSCALE));
|
||||
|
||||
Rect2 y_handle_rect = Rect2(-5 * EDSCALE, scale_factor.y * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
|
||||
viewport->draw_rect(y_handle_rect, get_color("axis_y_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(0, scale_factor.y * EDSCALE), get_color("axis_y_color", "Editor"), Math::round(EDSCALE));
|
||||
viewport->draw_rect(y_handle_rect, get_theme_color("axis_y_color", "Editor"));
|
||||
viewport->draw_line(Point2(), Point2(0, scale_factor.y * EDSCALE), get_theme_color("axis_y_color", "Editor"), Math::round(EDSCALE));
|
||||
|
||||
viewport->draw_set_transform_matrix(viewport->get_transform());
|
||||
}
|
||||
@@ -3371,11 +3371,11 @@ void CanvasItemEditor::_draw_selection() {
|
||||
|
||||
viewport->draw_rect(
|
||||
Rect2(bsfrom, bsto - bsfrom),
|
||||
get_color("box_selection_fill_color", "Editor"));
|
||||
get_theme_color("box_selection_fill_color", "Editor"));
|
||||
|
||||
viewport->draw_rect(
|
||||
Rect2(bsfrom, bsto - bsfrom),
|
||||
get_color("box_selection_stroke_color", "Editor"),
|
||||
get_theme_color("box_selection_stroke_color", "Editor"),
|
||||
false,
|
||||
Math::round(EDSCALE));
|
||||
}
|
||||
@@ -3385,7 +3385,7 @@ void CanvasItemEditor::_draw_selection() {
|
||||
viewport->draw_line(
|
||||
transform.xform(drag_rotation_center),
|
||||
transform.xform(drag_to),
|
||||
get_color("accent_color", "Editor") * Color(1, 1, 1, 0.6),
|
||||
get_theme_color("accent_color", "Editor") * Color(1, 1, 1, 0.6),
|
||||
Math::round(2 * EDSCALE));
|
||||
}
|
||||
}
|
||||
@@ -3435,8 +3435,8 @@ void CanvasItemEditor::_draw_axis() {
|
||||
|
||||
if (show_origin) {
|
||||
|
||||
_draw_straight_line(Point2(), Point2(1, 0), get_color("axis_x_color", "Editor") * Color(1, 1, 1, 0.75));
|
||||
_draw_straight_line(Point2(), Point2(0, 1), get_color("axis_y_color", "Editor") * Color(1, 1, 1, 0.75));
|
||||
_draw_straight_line(Point2(), Point2(1, 0), get_theme_color("axis_x_color", "Editor") * Color(1, 1, 1, 0.75));
|
||||
_draw_straight_line(Point2(), Point2(0, 1), get_theme_color("axis_y_color", "Editor") * Color(1, 1, 1, 0.75));
|
||||
}
|
||||
|
||||
if (show_viewport) {
|
||||
@@ -3547,7 +3547,7 @@ void CanvasItemEditor::_draw_invisible_nodes_positions(Node *p_node, const Trans
|
||||
Transform2D xform = transform * canvas_xform * parent_xform;
|
||||
|
||||
// Draw the node's position
|
||||
Ref<Texture2D> position_icon = get_icon("EditorPositionUnselected", "EditorIcons");
|
||||
Ref<Texture2D> position_icon = get_theme_icon("EditorPositionUnselected", "EditorIcons");
|
||||
Transform2D unscaled_transform = (xform * canvas_item->get_transform().affine_inverse() * canvas_item->_edit_get_transform()).orthonormalized();
|
||||
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
|
||||
viewport->draw_set_transform_matrix(simple_xform);
|
||||
@@ -3564,7 +3564,7 @@ void CanvasItemEditor::_draw_hover() {
|
||||
Ref<Texture2D> node_icon = hovering_results[i].icon;
|
||||
String node_name = hovering_results[i].name;
|
||||
|
||||
Ref<Font> font = get_font("font", "Label");
|
||||
Ref<Font> font = get_theme_font("font", "Label");
|
||||
Size2 node_name_size = font->get_string_size(node_name);
|
||||
Size2 item_size = Size2(node_icon->get_size().x + 4 + node_name_size.x, MAX(node_icon->get_size().y, node_name_size.y - 3));
|
||||
|
||||
@@ -3615,13 +3615,13 @@ void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p
|
||||
if (canvas_item) {
|
||||
float offset = 0;
|
||||
|
||||
Ref<Texture2D> lock = get_icon("LockViewport", "EditorIcons");
|
||||
Ref<Texture2D> lock = get_theme_icon("LockViewport", "EditorIcons");
|
||||
if (p_node->has_meta("_edit_lock_") && show_edit_locks) {
|
||||
lock->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
|
||||
offset += lock->get_size().x;
|
||||
}
|
||||
|
||||
Ref<Texture2D> group = get_icon("GroupViewport", "EditorIcons");
|
||||
Ref<Texture2D> group = get_theme_icon("GroupViewport", "EditorIcons");
|
||||
if (canvas_item->has_meta("_edit_group_") && show_edit_locks) {
|
||||
group->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
|
||||
//offset += group->get_size().x;
|
||||
@@ -3893,7 +3893,7 @@ void CanvasItemEditor::_notification(int p_what) {
|
||||
|
||||
if (p_what == NOTIFICATION_ENTER_TREE) {
|
||||
|
||||
select_sb->set_texture(get_icon("EditorRect2D", "EditorIcons"));
|
||||
select_sb->set_texture(get_theme_icon("EditorRect2D", "EditorIcons"));
|
||||
for (int i = 0; i < 4; i++) {
|
||||
select_sb->set_margin_size(Margin(i), 4);
|
||||
select_sb->set_default_margin(Margin(i), 4);
|
||||
@@ -3906,7 +3906,7 @@ void CanvasItemEditor::_notification(int p_what) {
|
||||
|
||||
} else if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
|
||||
|
||||
select_sb->set_texture(get_icon("EditorRect2D", "EditorIcons"));
|
||||
select_sb->set_texture(get_theme_icon("EditorRect2D", "EditorIcons"));
|
||||
}
|
||||
|
||||
if (p_what == NOTIFICATION_EXIT_TREE) {
|
||||
@@ -3915,85 +3915,85 @@ void CanvasItemEditor::_notification(int p_what) {
|
||||
}
|
||||
|
||||
if (p_what == NOTIFICATION_ENTER_TREE || p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
|
||||
select_button->set_icon(get_icon("ToolSelect", "EditorIcons"));
|
||||
list_select_button->set_icon(get_icon("ListSelect", "EditorIcons"));
|
||||
move_button->set_icon(get_icon("ToolMove", "EditorIcons"));
|
||||
scale_button->set_icon(get_icon("ToolScale", "EditorIcons"));
|
||||
rotate_button->set_icon(get_icon("ToolRotate", "EditorIcons"));
|
||||
smart_snap_button->set_icon(get_icon("Snap", "EditorIcons"));
|
||||
grid_snap_button->set_icon(get_icon("SnapGrid", "EditorIcons"));
|
||||
snap_config_menu->set_icon(get_icon("GuiTabMenu", "EditorIcons"));
|
||||
skeleton_menu->set_icon(get_icon("Bone", "EditorIcons"));
|
||||
override_camera_button->set_icon(get_icon("Camera2D", "EditorIcons"));
|
||||
pan_button->set_icon(get_icon("ToolPan", "EditorIcons"));
|
||||
ruler_button->set_icon(get_icon("Ruler", "EditorIcons"));
|
||||
pivot_button->set_icon(get_icon("EditPivot", "EditorIcons"));
|
||||
select_handle = get_icon("EditorHandle", "EditorIcons");
|
||||
anchor_handle = get_icon("EditorControlAnchor", "EditorIcons");
|
||||
lock_button->set_icon(get_icon("Lock", "EditorIcons"));
|
||||
unlock_button->set_icon(get_icon("Unlock", "EditorIcons"));
|
||||
group_button->set_icon(get_icon("Group", "EditorIcons"));
|
||||
ungroup_button->set_icon(get_icon("Ungroup", "EditorIcons"));
|
||||
key_loc_button->set_icon(get_icon("KeyPosition", "EditorIcons"));
|
||||
key_rot_button->set_icon(get_icon("KeyRotation", "EditorIcons"));
|
||||
key_scale_button->set_icon(get_icon("KeyScale", "EditorIcons"));
|
||||
key_insert_button->set_icon(get_icon("Key", "EditorIcons"));
|
||||
key_auto_insert_button->set_icon(get_icon("AutoKey", "EditorIcons"));
|
||||
animation_menu->set_icon(get_icon("GuiTabMenu", "EditorIcons"));
|
||||
select_button->set_icon(get_theme_icon("ToolSelect", "EditorIcons"));
|
||||
list_select_button->set_icon(get_theme_icon("ListSelect", "EditorIcons"));
|
||||
move_button->set_icon(get_theme_icon("ToolMove", "EditorIcons"));
|
||||
scale_button->set_icon(get_theme_icon("ToolScale", "EditorIcons"));
|
||||
rotate_button->set_icon(get_theme_icon("ToolRotate", "EditorIcons"));
|
||||
smart_snap_button->set_icon(get_theme_icon("Snap", "EditorIcons"));
|
||||
grid_snap_button->set_icon(get_theme_icon("SnapGrid", "EditorIcons"));
|
||||
snap_config_menu->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
|
||||
skeleton_menu->set_icon(get_theme_icon("Bone", "EditorIcons"));
|
||||
override_camera_button->set_icon(get_theme_icon("Camera2D", "EditorIcons"));
|
||||
pan_button->set_icon(get_theme_icon("ToolPan", "EditorIcons"));
|
||||
ruler_button->set_icon(get_theme_icon("Ruler", "EditorIcons"));
|
||||
pivot_button->set_icon(get_theme_icon("EditPivot", "EditorIcons"));
|
||||
select_handle = get_theme_icon("EditorHandle", "EditorIcons");
|
||||
anchor_handle = get_theme_icon("EditorControlAnchor", "EditorIcons");
|
||||
lock_button->set_icon(get_theme_icon("Lock", "EditorIcons"));
|
||||
unlock_button->set_icon(get_theme_icon("Unlock", "EditorIcons"));
|
||||
group_button->set_icon(get_theme_icon("Group", "EditorIcons"));
|
||||
ungroup_button->set_icon(get_theme_icon("Ungroup", "EditorIcons"));
|
||||
key_loc_button->set_icon(get_theme_icon("KeyPosition", "EditorIcons"));
|
||||
key_rot_button->set_icon(get_theme_icon("KeyRotation", "EditorIcons"));
|
||||
key_scale_button->set_icon(get_theme_icon("KeyScale", "EditorIcons"));
|
||||
key_insert_button->set_icon(get_theme_icon("Key", "EditorIcons"));
|
||||
key_auto_insert_button->set_icon(get_theme_icon("AutoKey", "EditorIcons"));
|
||||
animation_menu->set_icon(get_theme_icon("GuiTabMenu", "EditorIcons"));
|
||||
|
||||
zoom_minus->set_icon(get_icon("ZoomLess", "EditorIcons"));
|
||||
zoom_plus->set_icon(get_icon("ZoomMore", "EditorIcons"));
|
||||
zoom_minus->set_icon(get_theme_icon("ZoomLess", "EditorIcons"));
|
||||
zoom_plus->set_icon(get_theme_icon("ZoomMore", "EditorIcons"));
|
||||
|
||||
presets_menu->set_icon(get_icon("ControlLayout", "EditorIcons"));
|
||||
presets_menu->set_icon(get_theme_icon("ControlLayout", "EditorIcons"));
|
||||
PopupMenu *p = presets_menu->get_popup();
|
||||
|
||||
p->clear();
|
||||
p->add_icon_item(get_icon("ControlAlignTopLeft", "EditorIcons"), TTR("Top Left"), ANCHORS_AND_MARGINS_PRESET_TOP_LEFT);
|
||||
p->add_icon_item(get_icon("ControlAlignTopRight", "EditorIcons"), TTR("Top Right"), ANCHORS_AND_MARGINS_PRESET_TOP_RIGHT);
|
||||
p->add_icon_item(get_icon("ControlAlignBottomRight", "EditorIcons"), TTR("Bottom Right"), ANCHORS_AND_MARGINS_PRESET_BOTTOM_RIGHT);
|
||||
p->add_icon_item(get_icon("ControlAlignBottomLeft", "EditorIcons"), TTR("Bottom Left"), ANCHORS_AND_MARGINS_PRESET_BOTTOM_LEFT);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignTopLeft", "EditorIcons"), TTR("Top Left"), ANCHORS_AND_MARGINS_PRESET_TOP_LEFT);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignTopRight", "EditorIcons"), TTR("Top Right"), ANCHORS_AND_MARGINS_PRESET_TOP_RIGHT);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignBottomRight", "EditorIcons"), TTR("Bottom Right"), ANCHORS_AND_MARGINS_PRESET_BOTTOM_RIGHT);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignBottomLeft", "EditorIcons"), TTR("Bottom Left"), ANCHORS_AND_MARGINS_PRESET_BOTTOM_LEFT);
|
||||
p->add_separator();
|
||||
p->add_icon_item(get_icon("ControlAlignLeftCenter", "EditorIcons"), TTR("Center Left"), ANCHORS_AND_MARGINS_PRESET_CENTER_LEFT);
|
||||
p->add_icon_item(get_icon("ControlAlignTopCenter", "EditorIcons"), TTR("Center Top"), ANCHORS_AND_MARGINS_PRESET_CENTER_TOP);
|
||||
p->add_icon_item(get_icon("ControlAlignRightCenter", "EditorIcons"), TTR("Center Right"), ANCHORS_AND_MARGINS_PRESET_CENTER_RIGHT);
|
||||
p->add_icon_item(get_icon("ControlAlignBottomCenter", "EditorIcons"), TTR("Center Bottom"), ANCHORS_AND_MARGINS_PRESET_CENTER_BOTTOM);
|
||||
p->add_icon_item(get_icon("ControlAlignCenter", "EditorIcons"), TTR("Center"), ANCHORS_AND_MARGINS_PRESET_CENTER);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignLeftCenter", "EditorIcons"), TTR("Center Left"), ANCHORS_AND_MARGINS_PRESET_CENTER_LEFT);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignTopCenter", "EditorIcons"), TTR("Center Top"), ANCHORS_AND_MARGINS_PRESET_CENTER_TOP);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignRightCenter", "EditorIcons"), TTR("Center Right"), ANCHORS_AND_MARGINS_PRESET_CENTER_RIGHT);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignBottomCenter", "EditorIcons"), TTR("Center Bottom"), ANCHORS_AND_MARGINS_PRESET_CENTER_BOTTOM);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignCenter", "EditorIcons"), TTR("Center"), ANCHORS_AND_MARGINS_PRESET_CENTER);
|
||||
p->add_separator();
|
||||
p->add_icon_item(get_icon("ControlAlignLeftWide", "EditorIcons"), TTR("Left Wide"), ANCHORS_AND_MARGINS_PRESET_LEFT_WIDE);
|
||||
p->add_icon_item(get_icon("ControlAlignTopWide", "EditorIcons"), TTR("Top Wide"), ANCHORS_AND_MARGINS_PRESET_TOP_WIDE);
|
||||
p->add_icon_item(get_icon("ControlAlignRightWide", "EditorIcons"), TTR("Right Wide"), ANCHORS_AND_MARGINS_PRESET_RIGHT_WIDE);
|
||||
p->add_icon_item(get_icon("ControlAlignBottomWide", "EditorIcons"), TTR("Bottom Wide"), ANCHORS_AND_MARGINS_PRESET_BOTTOM_WIDE);
|
||||
p->add_icon_item(get_icon("ControlVcenterWide", "EditorIcons"), TTR("VCenter Wide"), ANCHORS_AND_MARGINS_PRESET_VCENTER_WIDE);
|
||||
p->add_icon_item(get_icon("ControlHcenterWide", "EditorIcons"), TTR("HCenter Wide"), ANCHORS_AND_MARGINS_PRESET_HCENTER_WIDE);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignLeftWide", "EditorIcons"), TTR("Left Wide"), ANCHORS_AND_MARGINS_PRESET_LEFT_WIDE);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignTopWide", "EditorIcons"), TTR("Top Wide"), ANCHORS_AND_MARGINS_PRESET_TOP_WIDE);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignRightWide", "EditorIcons"), TTR("Right Wide"), ANCHORS_AND_MARGINS_PRESET_RIGHT_WIDE);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignBottomWide", "EditorIcons"), TTR("Bottom Wide"), ANCHORS_AND_MARGINS_PRESET_BOTTOM_WIDE);
|
||||
p->add_icon_item(get_theme_icon("ControlVcenterWide", "EditorIcons"), TTR("VCenter Wide"), ANCHORS_AND_MARGINS_PRESET_VCENTER_WIDE);
|
||||
p->add_icon_item(get_theme_icon("ControlHcenterWide", "EditorIcons"), TTR("HCenter Wide"), ANCHORS_AND_MARGINS_PRESET_HCENTER_WIDE);
|
||||
p->add_separator();
|
||||
p->add_icon_item(get_icon("ControlAlignWide", "EditorIcons"), TTR("Full Rect"), ANCHORS_AND_MARGINS_PRESET_WIDE);
|
||||
p->add_icon_item(get_icon("Anchor", "EditorIcons"), TTR("Keep Ratio"), ANCHORS_AND_MARGINS_PRESET_KEEP_RATIO);
|
||||
p->add_icon_item(get_theme_icon("ControlAlignWide", "EditorIcons"), TTR("Full Rect"), ANCHORS_AND_MARGINS_PRESET_WIDE);
|
||||
p->add_icon_item(get_theme_icon("Anchor", "EditorIcons"), TTR("Keep Ratio"), ANCHORS_AND_MARGINS_PRESET_KEEP_RATIO);
|
||||
p->add_separator();
|
||||
p->add_submenu_item(TTR("Anchors only"), "Anchors");
|
||||
p->set_item_icon(21, get_icon("Anchor", "EditorIcons"));
|
||||
p->set_item_icon(21, get_theme_icon("Anchor", "EditorIcons"));
|
||||
|
||||
anchors_popup->clear();
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignTopLeft", "EditorIcons"), TTR("Top Left"), ANCHORS_PRESET_TOP_LEFT);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignTopRight", "EditorIcons"), TTR("Top Right"), ANCHORS_PRESET_TOP_RIGHT);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignBottomRight", "EditorIcons"), TTR("Bottom Right"), ANCHORS_PRESET_BOTTOM_RIGHT);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignBottomLeft", "EditorIcons"), TTR("Bottom Left"), ANCHORS_PRESET_BOTTOM_LEFT);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignTopLeft", "EditorIcons"), TTR("Top Left"), ANCHORS_PRESET_TOP_LEFT);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignTopRight", "EditorIcons"), TTR("Top Right"), ANCHORS_PRESET_TOP_RIGHT);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignBottomRight", "EditorIcons"), TTR("Bottom Right"), ANCHORS_PRESET_BOTTOM_RIGHT);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignBottomLeft", "EditorIcons"), TTR("Bottom Left"), ANCHORS_PRESET_BOTTOM_LEFT);
|
||||
anchors_popup->add_separator();
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignLeftCenter", "EditorIcons"), TTR("Center Left"), ANCHORS_PRESET_CENTER_LEFT);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignTopCenter", "EditorIcons"), TTR("Center Top"), ANCHORS_PRESET_CENTER_TOP);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignRightCenter", "EditorIcons"), TTR("Center Right"), ANCHORS_PRESET_CENTER_RIGHT);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignBottomCenter", "EditorIcons"), TTR("Center Bottom"), ANCHORS_PRESET_CENTER_BOTTOM);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignCenter", "EditorIcons"), TTR("Center"), ANCHORS_PRESET_CENTER);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignLeftCenter", "EditorIcons"), TTR("Center Left"), ANCHORS_PRESET_CENTER_LEFT);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignTopCenter", "EditorIcons"), TTR("Center Top"), ANCHORS_PRESET_CENTER_TOP);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignRightCenter", "EditorIcons"), TTR("Center Right"), ANCHORS_PRESET_CENTER_RIGHT);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignBottomCenter", "EditorIcons"), TTR("Center Bottom"), ANCHORS_PRESET_CENTER_BOTTOM);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignCenter", "EditorIcons"), TTR("Center"), ANCHORS_PRESET_CENTER);
|
||||
anchors_popup->add_separator();
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignLeftWide", "EditorIcons"), TTR("Left Wide"), ANCHORS_PRESET_LEFT_WIDE);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignTopWide", "EditorIcons"), TTR("Top Wide"), ANCHORS_PRESET_TOP_WIDE);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignRightWide", "EditorIcons"), TTR("Right Wide"), ANCHORS_PRESET_RIGHT_WIDE);
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignBottomWide", "EditorIcons"), TTR("Bottom Wide"), ANCHORS_PRESET_BOTTOM_WIDE);
|
||||
anchors_popup->add_icon_item(get_icon("ControlVcenterWide", "EditorIcons"), TTR("VCenter Wide"), ANCHORS_PRESET_VCENTER_WIDE);
|
||||
anchors_popup->add_icon_item(get_icon("ControlHcenterWide", "EditorIcons"), TTR("HCenter Wide"), ANCHORS_PRESET_HCENTER_WIDE);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignLeftWide", "EditorIcons"), TTR("Left Wide"), ANCHORS_PRESET_LEFT_WIDE);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignTopWide", "EditorIcons"), TTR("Top Wide"), ANCHORS_PRESET_TOP_WIDE);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignRightWide", "EditorIcons"), TTR("Right Wide"), ANCHORS_PRESET_RIGHT_WIDE);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignBottomWide", "EditorIcons"), TTR("Bottom Wide"), ANCHORS_PRESET_BOTTOM_WIDE);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlVcenterWide", "EditorIcons"), TTR("VCenter Wide"), ANCHORS_PRESET_VCENTER_WIDE);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlHcenterWide", "EditorIcons"), TTR("HCenter Wide"), ANCHORS_PRESET_HCENTER_WIDE);
|
||||
anchors_popup->add_separator();
|
||||
anchors_popup->add_icon_item(get_icon("ControlAlignWide", "EditorIcons"), TTR("Full Rect"), ANCHORS_PRESET_WIDE);
|
||||
anchors_popup->add_icon_item(get_theme_icon("ControlAlignWide", "EditorIcons"), TTR("Full Rect"), ANCHORS_PRESET_WIDE);
|
||||
|
||||
anchor_mode_button->set_icon(get_icon("Anchor", "EditorIcons"));
|
||||
anchor_mode_button->set_icon(get_theme_icon("Anchor", "EditorIcons"));
|
||||
}
|
||||
|
||||
if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
|
||||
@@ -5445,7 +5445,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
|
||||
|
||||
zoom_hb = memnew(HBoxContainer);
|
||||
// Bring the zoom percentage closer to the zoom buttons
|
||||
zoom_hb->add_constant_override("separation", Math::round(-8 * EDSCALE));
|
||||
zoom_hb->add_theme_constant_override("separation", Math::round(-8 * EDSCALE));
|
||||
controls_vb->add_child(zoom_hb);
|
||||
|
||||
viewport = memnew(CanvasItemEditorViewport(p_editor, this));
|
||||
@@ -5462,7 +5462,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
|
||||
info_overlay->set_margin(MARGIN_LEFT, 10);
|
||||
info_overlay->set_margin(MARGIN_BOTTOM, -15);
|
||||
info_overlay->set_v_grow_direction(Control::GROW_DIRECTION_BEGIN);
|
||||
info_overlay->add_constant_override("separation", 10);
|
||||
info_overlay->add_theme_constant_override("separation", 10);
|
||||
viewport_scrollable->add_child(info_overlay);
|
||||
|
||||
Theme *info_overlay_theme = memnew(Theme);
|
||||
@@ -5477,8 +5477,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
|
||||
warning_child_of_container = memnew(Label);
|
||||
warning_child_of_container->hide();
|
||||
warning_child_of_container->set_text(TTR("Warning: Children of a container get their position and size determined only by their parent."));
|
||||
warning_child_of_container->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("warning_color", "Editor"));
|
||||
warning_child_of_container->add_font_override("font", EditorNode::get_singleton()->get_gui_base()->get_font("main", "EditorFonts"));
|
||||
warning_child_of_container->add_theme_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_theme_color("warning_color", "Editor"));
|
||||
warning_child_of_container->add_theme_font_override("font", EditorNode::get_singleton()->get_gui_base()->get_theme_font("main", "EditorFonts"));
|
||||
add_control_to_info_overlay(warning_child_of_container);
|
||||
|
||||
h_scroll = memnew(HScrollBar);
|
||||
@@ -5783,7 +5783,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
|
||||
|
||||
selection_menu = memnew(PopupMenu);
|
||||
add_child(selection_menu);
|
||||
selection_menu->set_custom_minimum_size(Vector2(100, 0));
|
||||
selection_menu->set_min_size(Vector2(100, 0));
|
||||
selection_menu->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_selection_result_pressed));
|
||||
selection_menu->connect("popup_hide", callable_mp(this, &CanvasItemEditor::_selection_menu_hide));
|
||||
|
||||
@@ -6233,7 +6233,7 @@ void CanvasItemEditorViewport::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_ENTER_TREE: {
|
||||
connect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit));
|
||||
label->add_color_override("font_color", get_color("warning_color", "Editor"));
|
||||
label->add_theme_color_override("font_color", get_theme_color("warning_color", "Editor"));
|
||||
} break;
|
||||
case NOTIFICATION_EXIT_TREE: {
|
||||
disconnect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit));
|
||||
@@ -6293,17 +6293,17 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte
|
||||
}
|
||||
|
||||
label = memnew(Label);
|
||||
label->add_color_override("font_color_shadow", Color(0, 0, 0, 1));
|
||||
label->add_constant_override("shadow_as_outline", 1 * EDSCALE);
|
||||
label->add_theme_color_override("font_color_shadow", Color(0, 0, 0, 1));
|
||||
label->add_theme_constant_override("shadow_as_outline", 1 * EDSCALE);
|
||||
label->hide();
|
||||
canvas_item_editor->get_controls_container()->add_child(label);
|
||||
|
||||
label_desc = memnew(Label);
|
||||
label_desc->set_text(TTR("Drag & drop + Shift : Add node as sibling\nDrag & drop + Alt : Change node type"));
|
||||
label_desc->add_color_override("font_color", Color(0.6f, 0.6f, 0.6f, 1));
|
||||
label_desc->add_color_override("font_color_shadow", Color(0.2f, 0.2f, 0.2f, 1));
|
||||
label_desc->add_constant_override("shadow_as_outline", 1 * EDSCALE);
|
||||
label_desc->add_constant_override("line_spacing", 0);
|
||||
label_desc->add_theme_color_override("font_color", Color(0.6f, 0.6f, 0.6f, 1));
|
||||
label_desc->add_theme_color_override("font_color_shadow", Color(0.2f, 0.2f, 0.2f, 1));
|
||||
label_desc->add_theme_constant_override("shadow_as_outline", 1 * EDSCALE);
|
||||
label_desc->add_theme_constant_override("line_spacing", 0);
|
||||
label_desc->hide();
|
||||
canvas_item_editor->get_controls_container()->add_child(label_desc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user