Merge pull request #105994 from syntaxerror247/split_container
Add option for a touch-friendly drag handle in `SplitContainer`
This commit is contained in:
commit
b25f609eed
15 changed files with 157 additions and 17 deletions
|
|
@ -73,7 +73,7 @@ uint32_t EditorThemeManager::ThemeConfiguration::hash() {
|
|||
hash = hash_murmur3_one_float(relationship_line_opacity, hash);
|
||||
hash = hash_murmur3_one_32(thumb_size, hash);
|
||||
hash = hash_murmur3_one_32(class_icon_size, hash);
|
||||
hash = hash_murmur3_one_32((int)increase_scrollbar_touch_area, hash);
|
||||
hash = hash_murmur3_one_32((int)enable_touch_optimizations, hash);
|
||||
hash = hash_murmur3_one_float(gizmo_handle_scale, hash);
|
||||
hash = hash_murmur3_one_32(color_picker_button_height, hash);
|
||||
hash = hash_murmur3_one_float(subresource_hue_tint, hash);
|
||||
|
|
@ -246,7 +246,7 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config(
|
|||
config.relationship_line_opacity = EDITOR_GET("interface/theme/relationship_line_opacity");
|
||||
config.thumb_size = EDITOR_GET("filesystem/file_dialog/thumbnail_size");
|
||||
config.class_icon_size = 16 * EDSCALE;
|
||||
config.increase_scrollbar_touch_area = EDITOR_GET("interface/touchscreen/increase_scrollbar_touch_area");
|
||||
config.enable_touch_optimizations = EDITOR_GET("interface/touchscreen/enable_touch_optimizations");
|
||||
config.gizmo_handle_scale = EDITOR_GET("interface/touchscreen/scale_gizmo_handles");
|
||||
config.color_picker_button_height = 28 * EDSCALE;
|
||||
config.subresource_hue_tint = EDITOR_GET("docks/property_editor/subresource_hue_tint");
|
||||
|
|
@ -1437,7 +1437,7 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
|
|||
|
||||
// HScrollBar.
|
||||
|
||||
if (p_config.increase_scrollbar_touch_area) {
|
||||
if (p_config.enable_touch_optimizations) {
|
||||
p_theme->set_stylebox("scroll", "HScrollBar", make_line_stylebox(p_config.separator_color, 50));
|
||||
} else {
|
||||
p_theme->set_stylebox("scroll", "HScrollBar", make_stylebox(p_theme->get_icon(SNAME("GuiScrollBg"), EditorStringName(EditorIcons)), 5, 5, 5, 5, -5, 1, -5, 1));
|
||||
|
|
@ -1456,7 +1456,7 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
|
|||
|
||||
// VScrollBar.
|
||||
|
||||
if (p_config.increase_scrollbar_touch_area) {
|
||||
if (p_config.enable_touch_optimizations) {
|
||||
p_theme->set_stylebox("scroll", "VScrollBar", make_line_stylebox(p_config.separator_color, 50, 1, 1, true));
|
||||
} else {
|
||||
p_theme->set_stylebox("scroll", "VScrollBar", make_stylebox(p_theme->get_icon(SNAME("GuiScrollBg"), EditorStringName(EditorIcons)), 5, 5, 5, 5, 1, -5, 1, -5));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue