Skip to content

Commit eaa2d69

Browse files
alimpfardADKaster
authored andcommitted
LibGUI+Everywhere: Rename the 'style' frame property to 'frame_style'
'set_frame_style' is what Frame itself uses to set the value, and a significant number of GML files use 'frame_style' instead of just 'style', so let's switch to it and use it everywhere consistently.
1 parent f3a4118 commit eaa2d69

File tree

9 files changed

+11
-12
lines changed

9 files changed

+11
-12
lines changed

Userland/Applications/Browser/Tab.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@GUI::Frame {
1515
name: "webdriver_banner"
16-
style: "SunkenPanel"
16+
frame_style: "SunkenPanel"
1717
preferred_height: "shrink"
1818
foreground_role: "TooltipText"
1919
background_role: "Tooltip"

Userland/Applications/ClockSettings/ClockSettingsWidget.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
}
6464

6565
@GUI::Label {
66-
style: "SunkenContainer"
66+
frame_style: "SunkenContainer"
6767
name: "clock_preview"
6868
text: "12:34:56"
6969
}

Userland/Applications/DisplaySettings/FontSettings.gml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@GUI::Label {
2121
background_role: "Base"
22-
style: "SunkenContainer"
22+
frame_style: "SunkenContainer"
2323
fill_with_background_color: true
2424
name: "default_font_label"
2525
}
@@ -45,7 +45,7 @@
4545

4646
@GUI::Label {
4747
background_role: "Base"
48-
style: "SunkenContainer"
48+
frame_style: "SunkenContainer"
4949
fill_with_background_color: true
5050
name: "window_title_font_label"
5151
}
@@ -71,7 +71,7 @@
7171

7272
@GUI::Label {
7373
background_role: "Base"
74-
style: "SunkenContainer"
74+
frame_style: "SunkenContainer"
7575
fill_with_background_color: true
7676
name: "fixed_width_font_label"
7777
}

Userland/Applications/FontEditor/FontPreviewWindow.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
layout: @GUI::VerticalBoxLayout {
99
margins: [4]
1010
}
11-
style: "SunkenBox"
11+
frame_style: "SunkenBox"
1212

1313
@GUI::Label {
1414
name: "preview_label"

Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@GUI::Frame {
1919
name: "label_frame"
20-
style: "SunkenPanel"
20+
frame_style: "SunkenPanel"
2121
layout: @GUI::VerticalBoxLayout {
2222
margins: [3, 4]
2323
}

Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@GUI::HorizontalSeparator {}
3636

3737
@GUI::Frame {
38-
style: "SunkenPanel"
38+
frame_style: "SunkenPanel"
3939
preferred_height: "fit"
4040
layout: @GUI::VerticalBoxLayout {
4141
margins: [1]

Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@GUI::Label {
1919
name: "description_label"
2020
text_alignment: "CenterLeft"
21-
style: "SunkenContainer"
21+
frame_style: "SunkenContainer"
2222
max_height: 24
2323
}
2424

@@ -73,7 +73,7 @@
7373
name: "full_path_label"
7474
text_alignment: "CenterLeft"
7575
text: ""
76-
style: "SunkenContainer"
76+
frame_style: "SunkenContainer"
7777
max_height: 22
7878
}
7979
}

Userland/Libraries/LibGUI/EmojiInputDialog.gml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
@GUI::ScrollableContainerWidget {
2525
name: "scrollable_container"
26-
2726
content_widget: @GUI::Widget {
2827
name: "emojis"
2928
layout: @GUI::VerticalBoxLayout {}

Userland/Libraries/LibGUI/Frame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Frame::Frame()
1919
{
2020
set_frame_style(Gfx::FrameStyle::SunkenContainer);
2121

22-
REGISTER_ENUM_PROPERTY("style", frame_style, set_frame_style, Gfx::FrameStyle,
22+
REGISTER_ENUM_PROPERTY("frame_style", frame_style, set_frame_style, Gfx::FrameStyle,
2323
{ Gfx::FrameStyle::NoFrame, "NoFrame" },
2424
{ Gfx::FrameStyle::Window, "Window" },
2525
{ Gfx::FrameStyle::Plain, "Plain" },

0 commit comments

Comments
 (0)