Skip to content

Commit

Permalink
GMLPlayground: Move layout to GML
Browse files Browse the repository at this point in the history
There isn't much layout right now, but it felt very wrong to not have
the GML editor use GML. :^)
  • Loading branch information
AtkinsSJ authored and awesomekling committed Jan 13, 2023
1 parent 0bc591a commit d443a51
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
6 changes: 6 additions & 0 deletions Userland/DevTools/GMLPlayground/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@ serenity_component(
TARGETS GMLPlayground
)

compile_gml(GMLPlaygroundWindow.gml GMLPlaygroundWindowGML.h gml_playground_window_gml)

set(SOURCES
main.cpp
)

set(GENERATED_SOURCES
GMLPlaygroundWindowGML.h
)

serenity_app(GMLPlayground ICON app-gml-playground)
target_link_libraries(GMLPlayground PRIVATE LibCore LibDesktop LibFileSystemAccessClient LibGfx LibGUI LibMain LibSyntax)
17 changes: 17 additions & 0 deletions Userland/DevTools/GMLPlayground/GMLPlaygroundWindow.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@GUI::Widget {
layout: @GUI::VerticalBoxLayout {}
fill_with_background_color: true

@GUI::HorizontalSplitter {
layout: @GUI::HorizontalBoxLayout {}
name: "splitter"

@GUI::TextEditor {
name: "text_editor"
}

@GUI::Frame {
name: "preview_frame"
}
}
}
11 changes: 8 additions & 3 deletions Userland/DevTools/GMLPlayground/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright (c) 2020-2021, Andreas Kling <[email protected]>
* Copyright (c) 2021, Julius Heijmen <[email protected]>
* Copyright (c) 2022, kleines Filmröllchen <[email protected]>
* Copyright (c) 2022-2023, Sam Atkins <[email protected]>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
Expand All @@ -27,6 +28,7 @@
#include <LibGUI/VimEditingEngine.h>
#include <LibGUI/Window.h>
#include <LibMain/Main.h>
#include <Userland/DevTools/GMLPlayground/GMLPlaygroundWindowGML.h>

namespace {

Expand Down Expand Up @@ -84,9 +86,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_icon(app_icon.bitmap_for_size(16));
window->resize(800, 600);

auto splitter = TRY(window->set_main_widget<GUI::HorizontalSplitter>());
auto editor = TRY(splitter->try_add<GUI::TextEditor>());
auto preview_frame_widget = TRY(splitter->try_add<GUI::Frame>());
auto main_widget = TRY(window->set_main_widget<GUI::Widget>());
TRY(main_widget->load_from_gml(gml_playground_window_gml));

auto splitter = main_widget->find_descendant_of_type_named<GUI::HorizontalSplitter>("splitter");
auto editor = main_widget->find_descendant_of_type_named<GUI::TextEditor>("text_editor");
auto preview_frame_widget = main_widget->find_descendant_of_type_named<GUI::Frame>("preview_frame");

auto preview_window = TRY(GUI::Window::try_create());
preview_window->set_title("Preview - GML Playground");
Expand Down

0 comments on commit d443a51

Please sign in to comment.