Remove EDSCALE dependency from /scene/gui
This commit is contained in:
parent
4a42a66cd9
commit
bdbb7b3999
11 changed files with 68 additions and 109 deletions
|
@ -35,7 +35,6 @@
|
|||
#include "core/os/os.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/editor_settings.h"
|
||||
#endif
|
||||
#include "scene/main/window.h"
|
||||
|
@ -44,17 +43,7 @@ List<Color> ColorPicker::preset_cache;
|
|||
|
||||
void ColorPicker::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
btn_pick->set_icon(get_theme_icon(SNAME("screen_picker"), SNAME("ColorPicker")));
|
||||
btn_add_preset->set_icon(get_theme_icon(SNAME("add_preset")));
|
||||
_update_presets();
|
||||
_update_controls();
|
||||
} break;
|
||||
case NOTIFICATION_ENTER_TREE: {
|
||||
btn_pick->set_icon(get_theme_icon(SNAME("screen_picker"), SNAME("ColorPicker")));
|
||||
btn_add_preset->set_icon(get_theme_icon(SNAME("add_preset")));
|
||||
|
||||
_update_controls();
|
||||
_update_color();
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
@ -71,18 +60,39 @@ void ColorPicker::_notification(int p_what) {
|
|||
}
|
||||
}
|
||||
#endif
|
||||
} break;
|
||||
case NOTIFICATION_PARENTED: {
|
||||
[[fallthrough]];
|
||||
}
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
btn_pick->set_icon(get_theme_icon(SNAME("screen_picker"), SNAME("ColorPicker")));
|
||||
btn_add_preset->set_icon(get_theme_icon(SNAME("add_preset")));
|
||||
|
||||
uv_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("sv_width")), get_theme_constant(SNAME("sv_height"))));
|
||||
w_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("h_width")), 0));
|
||||
|
||||
wheel_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("sv_width")), get_theme_constant(SNAME("sv_height"))));
|
||||
wheel_margin->add_theme_constant_override("margin_bottom", 8 * get_theme_default_base_scale());
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
labels[i]->set_custom_minimum_size(Size2(get_theme_constant(SNAME("label_width")), 0));
|
||||
set_offset((Side)i, get_offset((Side)i) + get_theme_constant(SNAME("margin")));
|
||||
}
|
||||
|
||||
if (Engine::get_singleton()->is_editor_hint()) {
|
||||
// Adjust for the width of the "Script" icon.
|
||||
text_type->set_custom_minimum_size(Size2(28 * get_theme_default_base_scale(), 0));
|
||||
}
|
||||
|
||||
_update_presets();
|
||||
_update_controls();
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_VISIBILITY_CHANGED: {
|
||||
Popup *p = Object::cast_to<Popup>(get_parent());
|
||||
if (p) {
|
||||
p->set_size(Size2(get_combined_minimum_size().width + get_theme_constant(SNAME("margin")) * 2, get_combined_minimum_size().height + get_theme_constant(SNAME("margin")) * 2));
|
||||
}
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_WM_CLOSE_REQUEST: {
|
||||
if (screen != nullptr && screen->is_visible()) {
|
||||
screen->hide();
|
||||
|
@ -762,11 +772,7 @@ void ColorPicker::_slider_draw(int p_which) {
|
|||
Size2 size = scroll[p_which]->get_size();
|
||||
Color left_color;
|
||||
Color right_color;
|
||||
#ifdef TOOLS_ENABLED
|
||||
const real_t margin = 4 * EDSCALE;
|
||||
#else
|
||||
const real_t margin = 4;
|
||||
#endif
|
||||
const real_t margin = 4 * get_theme_default_base_scale();
|
||||
|
||||
if (p_which == 3) {
|
||||
scroll[p_which]->draw_texture_rect(get_theme_icon(SNAME("sample_bg"), SNAME("ColorPicker")), Rect2(Point2(0, margin), Size2(size.x, margin)), true);
|
||||
|
@ -1147,7 +1153,6 @@ ColorPicker::ColorPicker() :
|
|||
uv_edit->set_mouse_filter(MOUSE_FILTER_PASS);
|
||||
uv_edit->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
uv_edit->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||
uv_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("sv_width")), get_theme_constant(SNAME("sv_height"))));
|
||||
uv_edit->connect("draw", callable_mp(this, &ColorPicker::_hsv_draw), make_binds(0, uv_edit));
|
||||
|
||||
HBoxContainer *hb_smpl = memnew(HBoxContainer);
|
||||
|
@ -1219,9 +1224,6 @@ ColorPicker::ColorPicker() :
|
|||
text_type->set_text("#");
|
||||
text_type->set_tooltip(TTR("Switch between hexadecimal and code values."));
|
||||
if (Engine::get_singleton()->is_editor_hint()) {
|
||||
#ifdef TOOLS_ENABLED
|
||||
text_type->set_custom_minimum_size(Size2(28 * EDSCALE, 0)); // Adjust for the width of the "Script" icon.
|
||||
#endif
|
||||
text_type->connect("pressed", callable_mp(this, &ColorPicker::_text_type_toggled));
|
||||
} else {
|
||||
text_type->set_flat(true);
|
||||
|
@ -1236,7 +1238,6 @@ ColorPicker::ColorPicker() :
|
|||
|
||||
wheel_edit->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
wheel_edit->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||
wheel_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("sv_width")), get_theme_constant(SNAME("sv_height"))));
|
||||
hb_edit->add_child(wheel_edit);
|
||||
|
||||
wheel_mat.instantiate();
|
||||
|
@ -1244,12 +1245,7 @@ ColorPicker::ColorPicker() :
|
|||
circle_mat.instantiate();
|
||||
circle_mat->set_shader(circle_shader);
|
||||
|
||||
MarginContainer *wheel_margin(memnew(MarginContainer));
|
||||
#ifdef TOOLS_ENABLED
|
||||
wheel_margin->add_theme_constant_override("margin_bottom", 8 * EDSCALE);
|
||||
#else
|
||||
wheel_margin->add_theme_constant_override("margin_bottom", 8);
|
||||
#endif
|
||||
wheel_edit->add_child(wheel_margin);
|
||||
|
||||
wheel_margin->add_child(wheel);
|
||||
|
@ -1261,7 +1257,6 @@ ColorPicker::ColorPicker() :
|
|||
wheel_uv->connect("draw", callable_mp(this, &ColorPicker::_hsv_draw), make_binds(0, wheel_uv));
|
||||
|
||||
hb_edit->add_child(w_edit);
|
||||
w_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("h_width")), 0));
|
||||
w_edit->set_h_size_flags(SIZE_FILL);
|
||||
w_edit->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||
w_edit->connect("gui_input", callable_mp(this, &ColorPicker::_w_input));
|
||||
|
|
|
@ -81,6 +81,7 @@ private:
|
|||
Control *uv_edit = memnew(Control);
|
||||
Control *w_edit = memnew(Control);
|
||||
AspectRatioContainer *wheel_edit = memnew(AspectRatioContainer);
|
||||
MarginContainer *wheel_margin = memnew(MarginContainer);
|
||||
Ref<ShaderMaterial> wheel_mat;
|
||||
Ref<ShaderMaterial> circle_mat;
|
||||
Control *wheel = memnew(Control);
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "scene/main/window.h" // Only used to check for more modals when dimming the editor.
|
||||
#endif
|
||||
|
||||
|
@ -363,8 +362,7 @@ Button *ConfirmationDialog::get_cancel_button() {
|
|||
|
||||
ConfirmationDialog::ConfirmationDialog() {
|
||||
set_title(TTRC("Please Confirm..."));
|
||||
#ifdef TOOLS_ENABLED
|
||||
set_min_size(Size2(200, 70) * EDSCALE);
|
||||
#endif
|
||||
set_min_size(Size2(200, 70));
|
||||
|
||||
cancel = add_cancel_button();
|
||||
}
|
||||
|
|
|
@ -32,15 +32,6 @@
|
|||
|
||||
#include "core/os/keyboard.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_scale.h"
|
||||
#define SPACING (3 * EDSCALE)
|
||||
#define POINT_WIDTH (8 * EDSCALE)
|
||||
#else
|
||||
#define SPACING 3
|
||||
#define POINT_WIDTH 8
|
||||
#endif
|
||||
|
||||
GradientEdit::GradientEdit() {
|
||||
set_focus_mode(FOCUS_ALL);
|
||||
|
||||
|
@ -53,12 +44,12 @@ GradientEdit::GradientEdit() {
|
|||
|
||||
int GradientEdit::_get_point_from_pos(int x) {
|
||||
int result = -1;
|
||||
int total_w = get_size().width - get_size().height - SPACING;
|
||||
int total_w = get_size().width - get_size().height - draw_spacing;
|
||||
float min_distance = 1e20;
|
||||
for (int i = 0; i < points.size(); i++) {
|
||||
//Check if we clicked at point
|
||||
float distance = ABS(x - points[i].offset * total_w);
|
||||
float min = (POINT_WIDTH / 2 * 1.7); //make it easier to grab
|
||||
float min = (draw_point_width / 2 * 1.7); //make it easier to grab
|
||||
if (distance <= min && distance < min_distance) {
|
||||
result = i;
|
||||
min_distance = distance;
|
||||
|
@ -129,7 +120,7 @@ void GradientEdit::gui_input(const Ref<InputEvent> &p_event) {
|
|||
grabbed = _get_point_from_pos(x);
|
||||
|
||||
if (grabbed != -1) {
|
||||
int total_w = get_size().width - get_size().height - SPACING;
|
||||
int total_w = get_size().width - get_size().height - draw_spacing;
|
||||
Gradient::Point newPoint = points[grabbed];
|
||||
newPoint.offset = CLAMP(x / float(total_w), 0, 1);
|
||||
|
||||
|
@ -151,10 +142,10 @@ void GradientEdit::gui_input(const Ref<InputEvent> &p_event) {
|
|||
if (mb.is_valid() && mb->get_button_index() == 1 && mb->is_pressed()) {
|
||||
update();
|
||||
int x = mb->get_position().x;
|
||||
int total_w = get_size().width - get_size().height - SPACING;
|
||||
int total_w = get_size().width - get_size().height - draw_spacing;
|
||||
|
||||
//Check if color selector was clicked.
|
||||
if (x > total_w + SPACING) {
|
||||
if (x > total_w + draw_spacing) {
|
||||
_show_color_picker();
|
||||
return;
|
||||
}
|
||||
|
@ -225,7 +216,7 @@ void GradientEdit::gui_input(const Ref<InputEvent> &p_event) {
|
|||
Ref<InputEventMouseMotion> mm = p_event;
|
||||
|
||||
if (mm.is_valid() && grabbing) {
|
||||
int total_w = get_size().width - get_size().height - SPACING;
|
||||
int total_w = get_size().width - get_size().height - draw_spacing;
|
||||
|
||||
int x = mm->get_position().x;
|
||||
|
||||
|
@ -297,6 +288,12 @@ void GradientEdit::_notification(int p_what) {
|
|||
picker->connect("color_changed", callable_mp(this, &GradientEdit::_color_changed));
|
||||
}
|
||||
}
|
||||
|
||||
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
|
||||
draw_spacing = BASE_SPACING * get_theme_default_base_scale();
|
||||
draw_point_width = BASE_POINT_WIDTH * get_theme_default_base_scale();
|
||||
}
|
||||
|
||||
if (p_what == NOTIFICATION_DRAW) {
|
||||
int w = get_size().x;
|
||||
int h = get_size().y;
|
||||
|
@ -305,7 +302,7 @@ void GradientEdit::_notification(int p_what) {
|
|||
return; //Safety check. We have division by 'h'. And in any case there is nothing to draw with such size
|
||||
}
|
||||
|
||||
int total_w = get_size().width - get_size().height - SPACING;
|
||||
int total_w = get_size().width - get_size().height - draw_spacing;
|
||||
|
||||
//Draw checker pattern for ramp
|
||||
draw_texture_rect(get_theme_icon(SNAME("GuiMiniCheckerboard"), SNAME("EditorIcons")), Rect2(0, 0, total_w, h), true);
|
||||
|
@ -358,7 +355,7 @@ void GradientEdit::_notification(int p_what) {
|
|||
col.a = 0.9;
|
||||
|
||||
draw_line(Vector2(points[i].offset * total_w, 0), Vector2(points[i].offset * total_w, h / 2), col);
|
||||
Rect2 rect = Rect2(points[i].offset * total_w - POINT_WIDTH / 2, h / 2, POINT_WIDTH, h / 2);
|
||||
Rect2 rect = Rect2(points[i].offset * total_w - draw_point_width / 2, h / 2, draw_point_width, h / 2);
|
||||
draw_rect(rect, points[i].color, true);
|
||||
draw_rect(rect, col, false);
|
||||
if (grabbed == i) {
|
||||
|
@ -375,15 +372,15 @@ void GradientEdit::_notification(int p_what) {
|
|||
}
|
||||
|
||||
//Draw "button" for color selector
|
||||
draw_texture_rect(get_theme_icon(SNAME("GuiMiniCheckerboard"), SNAME("EditorIcons")), Rect2(total_w + SPACING, 0, h, h), true);
|
||||
draw_texture_rect(get_theme_icon(SNAME("GuiMiniCheckerboard"), SNAME("EditorIcons")), Rect2(total_w + draw_spacing, 0, h, h), true);
|
||||
if (grabbed != -1) {
|
||||
//Draw with selection color
|
||||
draw_rect(Rect2(total_w + SPACING, 0, h, h), points[grabbed].color);
|
||||
draw_rect(Rect2(total_w + draw_spacing, 0, h, h), points[grabbed].color);
|
||||
} else {
|
||||
//if no color selected draw grey color with 'X' on top.
|
||||
draw_rect(Rect2(total_w + SPACING, 0, h, h), Color(0.5, 0.5, 0.5, 1));
|
||||
draw_line(Vector2(total_w + SPACING, 0), Vector2(total_w + SPACING + h, h), Color(1, 1, 1, 0.6));
|
||||
draw_line(Vector2(total_w + SPACING, h), Vector2(total_w + SPACING + h, 0), Color(1, 1, 1, 0.6));
|
||||
draw_rect(Rect2(total_w + draw_spacing, 0, h, h), Color(0.5, 0.5, 0.5, 1));
|
||||
draw_line(Vector2(total_w + draw_spacing, 0), Vector2(total_w + draw_spacing + h, h), Color(1, 1, 1, 0.6));
|
||||
draw_line(Vector2(total_w + draw_spacing, h), Vector2(total_w + draw_spacing + h, 0), Color(1, 1, 1, 0.6));
|
||||
}
|
||||
|
||||
//Draw borders around color ramp if in focus
|
||||
|
|
|
@ -46,6 +46,13 @@ class GradientEdit : public Control {
|
|||
int grabbed = -1;
|
||||
Vector<Gradient::Point> points;
|
||||
|
||||
// Make sure to use the scaled value below.
|
||||
const int BASE_SPACING = 3;
|
||||
const int BASE_POINT_WIDTH = 8;
|
||||
|
||||
int draw_spacing = BASE_SPACING;
|
||||
int draw_point_width = BASE_POINT_WIDTH;
|
||||
|
||||
void _draw_checker(int x, int y, int w, int h);
|
||||
void _color_changed(const Color &p_color);
|
||||
int _get_point_from_pos(int x);
|
||||
|
|
|
@ -36,10 +36,6 @@
|
|||
#include "scene/gui/box_container.h"
|
||||
#include "scene/gui/button.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_scale.h"
|
||||
#endif
|
||||
|
||||
constexpr int MINIMAP_OFFSET = 12;
|
||||
constexpr int MINIMAP_PADDING = 5;
|
||||
|
||||
|
@ -436,6 +432,8 @@ void GraphEdit::_notification(int p_what) {
|
|||
snap_button->set_icon(get_theme_icon(SNAME("snap")));
|
||||
minimap_button->set_icon(get_theme_icon(SNAME("minimap")));
|
||||
layout_button->set_icon(get_theme_icon(SNAME("layout")));
|
||||
|
||||
zoom_label->set_custom_minimum_size(Size2(48, 0) * get_theme_default_base_scale());
|
||||
}
|
||||
if (p_what == NOTIFICATION_READY) {
|
||||
Size2 hmin = h_scroll->get_combined_minimum_size();
|
||||
|
@ -816,11 +814,7 @@ void GraphEdit::_draw_connection_line(CanvasItem *p_where, const Vector2 &p_from
|
|||
scaled_points.push_back(points[i] * p_zoom);
|
||||
}
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
p_where->draw_polyline_colors(scaled_points, colors, Math::floor(p_width * EDSCALE), lines_antialiased);
|
||||
#else
|
||||
p_where->draw_polyline_colors(scaled_points, colors, p_width, lines_antialiased);
|
||||
#endif
|
||||
p_where->draw_polyline_colors(scaled_points, colors, Math::floor(p_width * get_theme_default_base_scale()), lines_antialiased);
|
||||
}
|
||||
|
||||
void GraphEdit::_connections_layer_draw() {
|
||||
|
@ -2272,11 +2266,7 @@ GraphEdit::GraphEdit() {
|
|||
zoom_label->set_visible(false);
|
||||
zoom_label->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
|
||||
zoom_label->set_align(Label::ALIGN_CENTER);
|
||||
#ifdef TOOLS_ENABLED
|
||||
zoom_label->set_custom_minimum_size(Size2(48, 0) * EDSCALE);
|
||||
#else
|
||||
zoom_label->set_custom_minimum_size(Size2(48, 0));
|
||||
#endif
|
||||
_update_zoom_label();
|
||||
|
||||
zoom_minus = memnew(Button);
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#include "servers/display_server.h"
|
||||
#include "servers/text_server.h"
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/editor_settings.h"
|
||||
#endif
|
||||
#include "scene/main/window.h"
|
||||
|
@ -713,11 +712,7 @@ void LineEdit::_notification(int p_what) {
|
|||
ofs_max -= r_icon->get_width();
|
||||
}
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
int caret_width = Math::round(EDSCALE);
|
||||
#else
|
||||
int caret_width = 1;
|
||||
#endif
|
||||
int caret_width = Math::round(1 * get_theme_default_base_scale());
|
||||
|
||||
// Draw selections rects.
|
||||
Vector2 ofs = Point2(x_ofs + scroll_offset, y_ofs);
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
#include "modules/regex/regex.h"
|
||||
#endif
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_scale.h"
|
||||
#endif
|
||||
|
||||
RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) const {
|
||||
if (p_free) {
|
||||
if (p_item->subitems.size()) {
|
||||
|
@ -995,19 +991,13 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
|
|||
Color uc = font_color;
|
||||
uc.a *= 0.5;
|
||||
float y_off = TS->shaped_text_get_underline_position(rid);
|
||||
float underline_width = TS->shaped_text_get_underline_thickness(rid);
|
||||
#ifdef TOOLS_ENABLED
|
||||
underline_width *= EDSCALE;
|
||||
#endif
|
||||
float underline_width = TS->shaped_text_get_underline_thickness(rid) * get_theme_default_base_scale();
|
||||
draw_line(p_ofs + Vector2(off.x, off.y + y_off), p_ofs + Vector2(off.x + glyphs[i].advance * glyphs[i].repeat, off.y + y_off), uc, underline_width);
|
||||
} else if (_find_strikethrough(it)) {
|
||||
Color uc = font_color;
|
||||
uc.a *= 0.5;
|
||||
float y_off = -TS->shaped_text_get_ascent(rid) + TS->shaped_text_get_size(rid).y / 2;
|
||||
float underline_width = TS->shaped_text_get_underline_thickness(rid);
|
||||
#ifdef TOOLS_ENABLED
|
||||
underline_width *= EDSCALE;
|
||||
#endif
|
||||
float underline_width = TS->shaped_text_get_underline_thickness(rid) * get_theme_default_base_scale();
|
||||
draw_line(p_ofs + Vector2(off.x, off.y + y_off), p_ofs + Vector2(off.x + glyphs[i].advance * glyphs[i].repeat, off.y + y_off), uc, underline_width);
|
||||
}
|
||||
|
||||
|
|
|
@ -42,10 +42,6 @@
|
|||
|
||||
#include "scene/main/window.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_scale.h"
|
||||
#endif
|
||||
|
||||
static bool _is_text_char(char32_t c) {
|
||||
return !is_symbol(c);
|
||||
}
|
||||
|
@ -1173,12 +1169,8 @@ void TextEdit::_notification(int p_what) {
|
|||
}
|
||||
}
|
||||
|
||||
// Carets
|
||||
#ifdef TOOLS_ENABLED
|
||||
int caret_width = Math::round(EDSCALE);
|
||||
#else
|
||||
int caret_width = 1;
|
||||
#endif
|
||||
// Carets.
|
||||
int caret_width = Math::round(1 * get_theme_default_base_scale());
|
||||
|
||||
if (!clipped && caret.line == line && line_wrap_index == caret_wrap_index) {
|
||||
caret.draw_pos.y = ofs_y + ldata->get_line_descent(line_wrap_index);
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
|
||||
#include "box_container.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_scale.h"
|
||||
#endif
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
Size2 TreeItem::Cell::get_icon_size() const {
|
||||
|
@ -1377,6 +1373,8 @@ void Tree::update_cache() {
|
|||
cache.title_button_hover = get_theme_stylebox(SNAME("title_button_hover"));
|
||||
cache.title_button_color = get_theme_color(SNAME("title_button_color"));
|
||||
|
||||
cache.base_scale = get_theme_default_base_scale();
|
||||
|
||||
v_scroll->set_custom_step(cache.font->get_height(cache.font_size));
|
||||
}
|
||||
|
||||
|
@ -2046,15 +2044,9 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
|
|||
root_pos -= Point2i(cache.arrow->get_width(), 0);
|
||||
}
|
||||
|
||||
float line_width = cache.relationship_line_width;
|
||||
float parent_line_width = cache.parent_hl_line_width;
|
||||
float children_line_width = cache.children_hl_line_width;
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
line_width *= Math::round(EDSCALE);
|
||||
parent_line_width *= Math::round(EDSCALE);
|
||||
children_line_width *= Math::round(EDSCALE);
|
||||
#endif
|
||||
float line_width = cache.relationship_line_width * Math::round(cache.base_scale);
|
||||
float parent_line_width = cache.parent_hl_line_width * Math::round(cache.base_scale);
|
||||
float children_line_width = cache.children_hl_line_width * Math::round(cache.base_scale);
|
||||
|
||||
Point2i parent_pos = Point2i(parent_ofs - cache.arrow->get_width() / 2, p_pos.y + label_h / 2 + cache.arrow->get_height() / 2) - cache.offset + p_draw_ofs;
|
||||
|
||||
|
|
|
@ -516,6 +516,8 @@ private:
|
|||
Color custom_button_font_highlight;
|
||||
Color font_outline_color;
|
||||
|
||||
float base_scale = 1.0;
|
||||
|
||||
int hseparation = 0;
|
||||
int vseparation = 0;
|
||||
int item_margin = 0;
|
||||
|
|
Loading…
Reference in a new issue