Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
9ad5e9e4
Unverified
Commit
9ad5e9e4
authored
Jun 24, 2020
by
Rémi Verschelde
Committed by
GitHub
Jun 24, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39800 from Calinou/fix-default-button-styles
Fix default editor/project Button styles after ToolButton removal
parents
4c0b077f
9bd2d7a6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
25 deletions
+0
-25
editor_themes.cpp
editor/editor_themes.cpp
+0
-9
default_theme.cpp
scene/resources/default_theme/default_theme.cpp
+0
-16
No files found.
editor/editor_themes.cpp
View file @
9ad5e9e4
...
...
@@ -570,17 +570,8 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme
->
set_stylebox
(
"focus"
,
"PopupMenu"
,
style_menu
);
theme
->
set_stylebox
(
"disabled"
,
"PopupMenu"
,
style_menu
);
theme
->
set_stylebox
(
"normal"
,
"Button"
,
style_menu
);
theme
->
set_stylebox
(
"hover"
,
"Button"
,
style_menu
);
theme
->
set_stylebox
(
"pressed"
,
"Button"
,
style_menu
);
theme
->
set_stylebox
(
"focus"
,
"Button"
,
style_menu
);
theme
->
set_stylebox
(
"disabled"
,
"Button"
,
style_menu
);
theme
->
set_color
(
"font_color"
,
"MenuButton"
,
font_color
);
theme
->
set_color
(
"font_color_hover"
,
"MenuButton"
,
font_color_hl
);
theme
->
set_color
(
"font_color"
,
"Button"
,
font_color
);
theme
->
set_color
(
"font_color_hover"
,
"Button"
,
font_color_hl
);
theme
->
set_color
(
"font_color_pressed"
,
"Button"
,
accent_color
);
theme
->
set_stylebox
(
"MenuHover"
,
"EditorStyles"
,
style_menu_hover_border
);
...
...
scene/resources/default_theme/default_theme.cpp
View file @
9ad5e9e4
...
...
@@ -219,22 +219,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme
->
set_constant
(
"hseparation"
,
"ColorPickerButton"
,
2
*
scale
);
// Button
theme
->
set_stylebox
(
"normal"
,
"Button"
,
make_empty_stylebox
(
6
,
4
,
6
,
4
));
theme
->
set_stylebox
(
"pressed"
,
"Button"
,
make_stylebox
(
button_pressed_png
,
4
,
4
,
4
,
4
,
6
,
4
,
6
,
4
));
theme
->
set_stylebox
(
"hover"
,
"Button"
,
make_stylebox
(
button_normal_png
,
4
,
4
,
4
,
4
,
6
,
4
,
6
,
4
));
theme
->
set_stylebox
(
"disabled"
,
"Button"
,
make_empty_stylebox
(
6
,
4
,
6
,
4
));
theme
->
set_stylebox
(
"focus"
,
"Button"
,
focus
);
theme
->
set_font
(
"font"
,
"Button"
,
default_font
);
theme
->
set_color
(
"font_color"
,
"Button"
,
control_font_color
);
theme
->
set_color
(
"font_color_pressed"
,
"Button"
,
control_font_color_pressed
);
theme
->
set_color
(
"font_color_hover"
,
"Button"
,
control_font_color_hover
);
theme
->
set_color
(
"font_color_disabled"
,
"Button"
,
Color
(
0.9
,
0.95
,
1
,
0.3
));
theme
->
set_constant
(
"hseparation"
,
"Button"
,
3
);
// OptionButton
Ref
<
StyleBox
>
sb_optbutton_normal
=
sb_expand
(
make_stylebox
(
option_button_normal_png
,
4
,
4
,
21
,
4
,
6
,
3
,
9
,
3
),
2
,
2
,
2
,
2
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment