Rename Window --> Panel for immediate-mode panels

ComputationalBiomechanicsLab · Feb 13, 2025 · fdc9fcf · fdc9fcf
1 parent cc86688
commit fdc9fcf
Show file tree

Hide file tree

Showing 32 changed files with 107 additions and 107 deletions.
diff --git a/libopensimcreator/UI/FrameDefinition/FrameDefinitionTab.cpp b/libopensimcreator/UI/FrameDefinition/FrameDefinitionTab.cpp
@@ -863,7 +863,7 @@ namespace
             OpenSim::ComponentPath componentPath_,
             std::optional<ModelViewerPanelRightClickEvent> maybeSourceVisualizerEvent_ = std::nullopt) :
 
-            StandardPopup{popupName_, {10.0f, 10.0f}, ui::WindowFlag::NoMove},
+            StandardPopup{popupName_, {10.0f, 10.0f}, ui::PanelFlag::NoMove},
             m_PanelManager{std::move(panelManager_)},
             m_Model{std::move(model_)},
             m_ComponentPath{std::move(componentPath_)},

diff --git a/libopensimcreator/UI/LoadingTab.cpp b/libopensimcreator/UI/LoadingTab.cpp
@@ -114,14 +114,14 @@ class osc::LoadingTab::Impl final : public TabPrivate {
         }
 
         if (m_LoadingErrorMsg.empty()) {
-            if (ui::begin_panel("Loading Message", nullptr, ui::WindowFlag::NoTitleBar)) {
+            if (ui::begin_panel("Loading Message", nullptr, ui::PanelFlag::NoTitleBar)) {
                 ui::draw_text("loading: %s", m_OsimPath.string().c_str());
                 ui::draw_progress_bar(m_LoadingProgress);
             }
             ui::end_panel();
         }
         else {
-            if (ui::begin_panel("Error Message", nullptr, ui::WindowFlag::NoTitleBar)) {
+            if (ui::begin_panel("Error Message", nullptr, ui::PanelFlag::NoTitleBar)) {
                 ui::draw_text_wrapped("An error occurred while loading the file:");
                 ui::draw_dummy({0.0f, 5.0f});
                 ui::draw_text_wrapped(m_LoadingErrorMsg);

diff --git a/libopensimcreator/UI/MeshImporter/MeshImporterTab.cpp b/libopensimcreator/UI/MeshImporter/MeshImporterTab.cpp
@@ -238,7 +238,7 @@ class osc::mi::MeshImporterTab::Impl final :
         if (m_Shared->isPanelEnabled(MeshImporterSharedState::PanelIndex::Log))
         {
             bool v = true;
-            if (ui::begin_panel("Log", &v, ui::WindowFlag::MenuBar))
+            if (ui::begin_panel("Log", &v, ui::PanelFlag::MenuBar))
             {
                 m_Shared->updLogViewer().on_draw();
             }
@@ -2360,13 +2360,13 @@ class osc::mi::MeshImporterTab::Impl final :
             ui::open_popup("##visualizermodalpopup");
             ui::set_next_panel_size(m_Shared->get3DSceneDims());
             ui::set_next_panel_pos(m_Shared->get3DSceneRect().p1);
-            ui::push_style_var(ui::StyleVar::WindowPadding, {0.0f, 0.0f});
+            ui::push_style_var(ui::StyleVar::PanelPadding, {0.0f, 0.0f});
 
-            const ui::WindowFlags modalFlags = {
-                ui::WindowFlag::AlwaysAutoResize,
-                ui::WindowFlag::NoTitleBar,
-                ui::WindowFlag::NoMove,
-                ui::WindowFlag::NoResize,
+            const ui::PanelFlags modalFlags = {
+                ui::PanelFlag::AlwaysAutoResize,
+                ui::PanelFlag::NoTitleBar,
+                ui::PanelFlag::NoMove,
+                ui::PanelFlag::NoResize,
             };
 
             if (ui::begin_popup_modal("##visualizermodalpopup", nullptr, modalFlags))
@@ -2382,7 +2382,7 @@ class osc::mi::MeshImporterTab::Impl final :
         }
         else
         {
-            ui::push_style_var(ui::StyleVar::WindowPadding, {0.0f, 0.0f});
+            ui::push_style_var(ui::StyleVar::PanelPadding, {0.0f, 0.0f});
             if (ui::begin_panel("wizard_3dViewer"))
             {
                 ui::pop_style_var();

diff --git a/libopensimcreator/UI/MeshWarper/MeshWarpingTabPanel.h b/libopensimcreator/UI/MeshWarper/MeshWarpingTabPanel.h
@@ -13,7 +13,7 @@ namespace osc
     private:
         void impl_before_imgui_begin() final
         {
-            ui::push_style_var(ui::StyleVar::WindowPadding, {0.0f, 0.0f});
+            ui::push_style_var(ui::StyleVar::PanelPadding, {0.0f, 0.0f});
         }
 
         void impl_after_imgui_begin() final

diff --git a/libopensimcreator/UI/MeshWarper/MeshWarpingTabToolbar.cpp b/libopensimcreator/UI/MeshWarper/MeshWarpingTabToolbar.cpp
@@ -136,7 +136,7 @@ class osc::MeshWarpingTabToolbar::Impl final {
         if (ui::draw_button("visualization options " OSC_ICON_COG)) {
             ui::open_popup("visualization_options_popup");
         }
-        if (ui::begin_popup("visualization_options_popup", {ui::WindowFlag::AlwaysAutoResize, ui::WindowFlag::NoTitleBar, ui::WindowFlag::NoSavedSettings})) {
+        if (ui::begin_popup("visualization_options_popup", {ui::PanelFlag::AlwaysAutoResize, ui::PanelFlag::NoTitleBar, ui::PanelFlag::NoSavedSettings})) {
             DrawRenderingOptionsEditor(m_State->updCustomRenderingOptions());
             DrawOverlayOptionsEditor(m_State->updOverlayDecorationOptions());
             {

diff --git a/libopensimcreator/UI/ModelEditor/AddBodyPopup.cpp b/libopensimcreator/UI/ModelEditor/AddBodyPopup.cpp
@@ -116,7 +116,7 @@ class osc::AddBodyPopup::Impl final : public StandardPopup {
             ui::draw_help_marker("What the added body will be joined to. All bodies in an OpenSim model are connected to other bodies, or the ground, by joints. This is true even if the joint is unconstrained and does nothing (e.g. an OpenSim::FreeJoint) or if the joint constrains motion in all direcctions (e.g. an OpenSim::WeldJoint).");
             ui::next_column();
 
-            ui::begin_child_panel("join targets", Vec2{0, 128.0f}, ui::ChildPanelFlag::Border, ui::WindowFlag::HorizontalScrollbar);
+            ui::begin_child_panel("join targets", Vec2{0, 128.0f}, ui::ChildPanelFlag::Border, ui::PanelFlag::HorizontalScrollbar);
             for (const auto& pf : model.getComponentList<OpenSim::PhysicalFrame>()) {
                 if (ui::draw_selectable(pf.getName(), &pf == selectedPf)) {
                     selectedPf = &pf;

diff --git a/libopensimcreator/UI/ModelEditor/Select1PFPopup.cpp b/libopensimcreator/UI/ModelEditor/Select1PFPopup.cpp
@@ -30,7 +30,7 @@ class osc::Select1PFPopup::Impl final : public StandardPopup {
     {
         const OpenSim::PhysicalFrame* selected = nullptr;
 
-        ui::begin_child_panel("pflist", Vec2{256.0f, 256.0f}, ui::ChildPanelFlag::Border, ui::WindowFlag::HorizontalScrollbar);
+        ui::begin_child_panel("pflist", Vec2{256.0f, 256.0f}, ui::ChildPanelFlag::Border, ui::PanelFlag::HorizontalScrollbar);
         for (const auto& pf : m_Model->getModel().getComponentList<OpenSim::PhysicalFrame>()) {
             if (ui::draw_selectable(pf.getName())) {
                 selected = &pf;

diff --git a/libopensimcreator/UI/ModelEditor/SelectComponentPopup.cpp b/libopensimcreator/UI/ModelEditor/SelectComponentPopup.cpp
@@ -33,7 +33,7 @@ class osc::SelectComponentPopup::Impl final : public StandardPopup {
 
         // iterate through each T in `root` and give the user the option to click it
         {
-            ui::begin_child_panel("first", Vec2{256.0f, 256.0f}, ui::ChildPanelFlag::Border, ui::WindowFlag::HorizontalScrollbar);
+            ui::begin_child_panel("first", Vec2{256.0f, 256.0f}, ui::ChildPanelFlag::Border, ui::PanelFlag::HorizontalScrollbar);
             for (const OpenSim::Component& c : m_Model->getModel().getComponentList())
             {
                 if (!m_Filter(c))

diff --git a/libopensimcreator/UI/ModelEditor/SelectGeometryPopup.cpp b/libopensimcreator/UI/ModelEditor/SelectGeometryPopup.cpp
@@ -142,7 +142,7 @@ class osc::SelectGeometryPopup::Impl final : public StandardPopup {
             "mesh list",
             Vec2{ui::get_content_region_available().x, 256},
             ui::ChildPanelFlags{},
-            ui::WindowFlag::HorizontalScrollbar);
+            ui::PanelFlag::HorizontalScrollbar);
 
         if (!m_RecentUserChoices.empty())
         {

diff --git a/libopensimcreator/UI/Shared/BasicWidgets.cpp b/libopensimcreator/UI/Shared/BasicWidgets.cpp
@@ -1304,11 +1304,11 @@ bool osc::BeginToolbar(CStringView label, std::optional<Vec2> padding)
 {
     if (padding)
     {
-        ui::push_style_var(ui::StyleVar::WindowPadding, *padding);
+        ui::push_style_var(ui::StyleVar::PanelPadding, *padding);
     }
 
     const float height = ui::get_frame_height() + 2.0f*ui::get_style_panel_padding().y;
-    const ui::WindowFlags flags = {ui::WindowFlag::NoScrollbar, ui::WindowFlag::NoSavedSettings};
+    const ui::PanelFlags flags = {ui::PanelFlag::NoScrollbar, ui::PanelFlag::NoSavedSettings};
     bool open = ui::begin_main_viewport_top_bar(label, height, flags);
     if (padding)
     {

diff --git a/libopensimcreator/UI/Shared/ChooseComponentsEditorLayer.cpp b/libopensimcreator/UI/Shared/ChooseComponentsEditorLayer.cpp
@@ -175,7 +175,7 @@ class osc::ChooseComponentsEditorLayer::Impl final {
         ModelViewerPanelParameters& panelParams,
         ModelViewerPanelState& panelState)
     {
-        const bool layerIsHovered = ui::is_panel_hovered(ui::HoveredFlag::RootAndChildWindows);
+        const bool layerIsHovered = ui::is_panel_hovered(ui::HoveredFlag::RootAndChildPanels);
 
         // update this layer's state from provided state
         m_State.renderParams = panelParams.getRenderParams();

diff --git a/libopensimcreator/UI/Shared/ComponentContextMenu.cpp b/libopensimcreator/UI/Shared/ComponentContextMenu.cpp
@@ -363,7 +363,7 @@ class osc::ComponentContextMenu::Impl final : public StandardPopup {
         OpenSim::ComponentPath path_,
         ComponentContextMenuFlags flags_) :
 
-        StandardPopup{popupName_, {10.0f, 10.0f}, ui::WindowFlag::NoMove},
+        StandardPopup{popupName_, {10.0f, 10.0f}, ui::PanelFlag::NoMove},
         m_Parent{parent_.weak_ref()},
         m_Model{std::move(model_)},
         m_Path{std::move(path_)},

diff --git a/libopensimcreator/UI/Shared/FunctionCurveViewerPopup.cpp b/libopensimcreator/UI/Shared/FunctionCurveViewerPopup.cpp
@@ -34,7 +34,7 @@ class osc::FunctionCurveViewerPanel::Impl final : public PanelPrivate {
         std::shared_ptr<const IVersionedComponentAccessor> targetComponent,
         std::function<const OpenSim::Function*()> functionGetter) :
 
-        PanelPrivate{owner, nullptr, popupName, ui::WindowFlag::AlwaysAutoResize},
+        PanelPrivate{owner, nullptr, popupName, ui::PanelFlag::AlwaysAutoResize},
         m_Component{std::move(targetComponent)},
         m_FunctionGetter{std::move(functionGetter)}
     {}

diff --git a/libopensimcreator/UI/Shared/GeometryPathEditorPopup.cpp b/libopensimcreator/UI/Shared/GeometryPathEditorPopup.cpp
@@ -123,7 +123,7 @@ class osc::GeometryPathEditorPopup::Impl final : public StandardPopup {
         std::function<const OpenSim::GeometryPath*()> geometryPathGetter_,
         std::function<void(const OpenSim::GeometryPath&)> onLocalCopyEdited_) :
 
-        StandardPopup{popupName_, {768.0f, 0.0f}, ui::WindowFlag::AlwaysAutoResize},
+        StandardPopup{popupName_, {768.0f, 0.0f}, ui::PanelFlag::AlwaysAutoResize},
         m_TargetComponent{std::move(targetComponent_)},
         m_GeometryPathGetter{std::move(geometryPathGetter_)},
         m_OnLocalCopyEdited{std::move(onLocalCopyEdited_)},

diff --git a/libopensimcreator/UI/Shared/ModelViewerPanel.cpp b/libopensimcreator/UI/Shared/ModelViewerPanel.cpp
@@ -444,7 +444,7 @@ class osc::ModelViewerPanel::Impl final : public PanelPrivate {
             // check if the window is conditionally hovered: this returns true if no other window is
             // overlapping the editor panel, _but_ it also returns true if the user is only hovering
             // the title bar of the window, rather than specifically the render
-            const bool windowHovered = ui::is_panel_hovered(ui::HoveredFlag::ChildWindows);
+            const bool windowHovered = ui::is_panel_hovered(ui::HoveredFlag::ChildPanels);
 
             // check if the 3D render is hovered - ignore blocking and overlapping because the layer
             // stack might be screwing with this
@@ -525,16 +525,16 @@ class osc::ModelViewerPanel::Impl final : public PanelPrivate {
         {
             ModelViewerPanelLayer& layer = **it;
 
-            ui::WindowFlags windowFlags = ui::get_minimal_panel_flags().without(ui::WindowFlag::NoInputs);
+            ui::PanelFlags windowFlags = ui::get_minimal_panel_flags().without(ui::PanelFlag::NoInputs);
 
             // if any layer above this one captures mouse inputs then disable this layer's inputs
             if (find_if(it+1, m_Layers.end(), [](const auto& layerPtr) -> bool { return layerPtr->getFlags() & ModelViewerPanelLayerFlags::CapturesMouseInputs; }) != m_Layers.end())
             {
-                windowFlags |= ui::WindowFlag::NoInputs;
+                windowFlags |= ui::PanelFlag::NoInputs;
             }
 
             // layers always have a background (although, it can be entirely invisible)
-            windowFlags = windowFlags.without(ui::WindowFlag::NoBackground);
+            windowFlags = windowFlags.without(ui::PanelFlag::NoBackground);
             ui::set_next_panel_bg_alpha(layer.getBackgroundAlpha());
 
             // draw the layer in a child window, so that ImGui understands that hittests
@@ -592,5 +592,5 @@ const PolarPerspectiveCamera& osc::ModelViewerPanel::getCamera() const { return
 void osc::ModelViewerPanel::setCamera(const PolarPerspectiveCamera& camera) { private_data().setCamera(camera); }
 void osc::ModelViewerPanel::setModelState(const std::shared_ptr<IModelStatePair>& newModelState) { private_data().setModelState(newModelState); }
 void osc::ModelViewerPanel::impl_draw_content() { private_data().draw_content(); }
-void osc::ModelViewerPanel::impl_before_imgui_begin() { ui::push_style_var(ui::StyleVar::WindowPadding, {0.0f, 0.0f}); }
+void osc::ModelViewerPanel::impl_before_imgui_begin() { ui::push_style_var(ui::StyleVar::PanelPadding, {0.0f, 0.0f}); }
 void osc::ModelViewerPanel::impl_after_imgui_begin() { ui::pop_style_var(); }
diff --git a/libopensimcreator/UI/Shared/NavigatorPanel.cpp b/libopensimcreator/UI/Shared/NavigatorPanel.cpp
@@ -142,7 +142,7 @@ class osc::NavigatorPanel::Impl final : public PanelPrivate {
             "##componentnavigatorvieweritems",
             Vec2{0.0, 0.0},
             ui::ChildPanelFlags{},
-            ui::WindowFlag::NoBackground
+            ui::PanelFlag::NoBackground
         );
 
         ui::draw_dummy({0.0f, 0.05f*ui::get_text_line_height()});
@@ -241,7 +241,7 @@ class osc::NavigatorPanel::Impl final : public PanelPrivate {
                 const auto offset = ui::get_cursor_screen_pos() - ui::get_cursor_pos();
                 const auto topLeft = Vec2{0.0f, ui::get_cursor_pos().y};
                 const auto bottomRight =  topLeft + Vec2{ui::get_panel_size().x, ui::get_text_line_height_with_spacing()};
-                ui::get_panel_draw_list().add_rect_filled({offset+topLeft, offset+bottomRight}, multiply_luminance(ui::get_color(ui::ColorVar::WindowBg), 1.2f));
+                ui::get_panel_draw_list().add_rect_filled({offset+topLeft, offset+bottomRight}, multiply_luminance(ui::get_color(ui::ColorVar::PanelBg), 1.2f));
             }
 
             // handle coloring

diff --git a/libopensimcreator/UI/Shared/ParamBlockEditorPopup.cpp b/libopensimcreator/UI/Shared/ParamBlockEditorPopup.cpp
@@ -73,7 +73,7 @@ class osc::ParamBlockEditorPopup::Impl final : public StandardPopup {
 public:
 
     Impl(std::string_view popupName, ParamBlock* paramBlock) :
-        StandardPopup{popupName, {512.0f, 0.0f}, ui::WindowFlag::AlwaysAutoResize},
+        StandardPopup{popupName, {512.0f, 0.0f}, ui::PanelFlag::AlwaysAutoResize},
         m_OutputTarget{paramBlock},
         m_LocalCopy{*m_OutputTarget}
     {}

diff --git a/libopensimcreator/UI/SplashTab.cpp b/libopensimcreator/UI/SplashTab.cpp
@@ -190,7 +190,7 @@ class osc::SplashTab::Impl final : public TabPrivate {
         ui::set_next_panel_pos(viewportUIRect.p1);
         ui::set_next_panel_size(dimensions_of(viewportUIRect));
 
-        ui::push_style_var(ui::StyleVar::WindowPadding, { 0.0f, 0.0f });
+        ui::push_style_var(ui::StyleVar::PanelPadding, { 0.0f, 0.0f });
         ui::begin_panel("##splashscreenbackground", nullptr, ui::get_minimal_panel_flags());
         ui::pop_style_var();
 
@@ -229,7 +229,7 @@ class osc::SplashTab::Impl final : public TabPrivate {
         ui::set_next_panel_size({dims.x, -1.0f});
         ui::set_next_panel_size_constraints(dims, dims);
 
-        if (ui::begin_panel("Splash screen", nullptr, ui::WindowFlag::NoTitleBar)) {
+        if (ui::begin_panel("Splash screen", nullptr, ui::PanelFlag::NoTitleBar)) {
             drawMenuContent();
         }
         ui::end_panel();

diff --git a/libopensimcreator/UI/TPS2DTab.cpp b/libopensimcreator/UI/TPS2DTab.cpp
@@ -372,7 +372,7 @@ class osc::TPS2DTab::Impl final : public TabPrivate {
             const float panelHeight = 50.0f;
             ui::set_next_panel_pos({ outputWindowPos.x + leftPadding, outputWindowPos.y + outputWindowDims.y - panelHeight - bottomPadding });
             ui::set_next_panel_size({ outputWindowDims.x - leftPadding, panelHeight });
-            ui::begin_panel("##scrubber", nullptr, ui::get_minimal_panel_flags().without(ui::WindowFlag::NoInputs));
+            ui::begin_panel("##scrubber", nullptr, ui::get_minimal_panel_flags().without(ui::PanelFlag::NoInputs));
             ui::set_next_item_width(ui::get_content_region_available().x);
             ui::draw_float_slider("##blend", &m_BlendingFactor, 0.0f, 1.0f);
             ui::end_panel();

diff --git a/liboscar/UI/Panels/LogViewerPanel.cpp b/liboscar/UI/Panels/LogViewerPanel.cpp
@@ -13,7 +13,7 @@ class osc::LogViewerPanel::Impl final : public PanelPrivate {
 public:
 
     explicit Impl(LogViewerPanel& owner, std::string_view panel_name) :
-        PanelPrivate{owner, nullptr, panel_name, ui::WindowFlag::MenuBar}
+        PanelPrivate{owner, nullptr, panel_name, ui::PanelFlag::MenuBar}
     {}
 
     void draw_content() { log_viewer_.on_draw(); }

diff --git a/liboscar/UI/Panels/Panel.cpp b/liboscar/UI/Panels/Panel.cpp
@@ -10,8 +10,8 @@
 osc::Panel::Panel() :
     Panel{std::make_unique<PanelPrivate>(*this)}
 {}
-osc::Panel::Panel(Widget* parent, std::string_view panel_name, ui::WindowFlags window_flags) :
-    Panel{std::make_unique<PanelPrivate>(*this, parent, panel_name, window_flags)}
+osc::Panel::Panel(Widget* parent, std::string_view panel_name, ui::PanelFlags panel_flags) :
+    Panel{std::make_unique<PanelPrivate>(*this, parent, panel_name, panel_flags)}
 {}
 osc::Panel::Panel(std::unique_ptr<PanelPrivate>&& ptr) :
     Widget{std::move(ptr)}

diff --git a/liboscar/UI/Panels/Panel.h b/liboscar/UI/Panels/Panel.h
@@ -13,7 +13,7 @@ namespace osc
     class Panel : public Widget {
     public:
         Panel();
-        Panel(Widget* parent, std::string_view panel_name, ui::WindowFlags = {});
+        Panel(Widget* parent, std::string_view panel_name, ui::PanelFlags = {});
 
         bool is_open() const;
         void open();

diff --git a/liboscar/UI/Panels/PanelPrivate.cpp b/liboscar/UI/Panels/PanelPrivate.cpp
@@ -23,7 +23,7 @@ osc::PanelPrivate::PanelPrivate(
     Panel& owner,
     Widget* parent,
     std::string_view panel_name,
-    ui::WindowFlags window_flags) :
+    ui::PanelFlags window_flags) :
 
     WidgetPrivate{owner, parent},
     panel_enabled_config_key_{create_panel_enabled_config_key(panel_name)},

diff --git a/liboscar/UI/Panels/PanelPrivate.h b/liboscar/UI/Panels/PanelPrivate.h
@@ -15,15 +15,15 @@ namespace osc
             Panel& owner,
             Widget* parent = nullptr,
             std::string_view panel_name = "unnamed",
-            ui::WindowFlags window_flags = {}
+            ui::PanelFlags panel_flags = {}
         );
 
         bool is_open() const;
         void set_open(bool);
 
-        ui::WindowFlags panel_flags() const { return panel_flags_; }
+        ui::PanelFlags panel_flags() const { return panel_flags_; }
     private:
         std::string panel_enabled_config_key_;
-        ui::WindowFlags panel_flags_;
+        ui::PanelFlags panel_flags_;
     };
 }
diff --git a/liboscar/UI/Popups/StandardPopup.cpp b/liboscar/UI/Popups/StandardPopup.cpp
@@ -10,18 +10,18 @@
 #include <string_view>
 
 osc::StandardPopup::StandardPopup(std::string_view popup_name) :
-    StandardPopup{popup_name, {512.0f, 0.0f}, ui::WindowFlag::AlwaysAutoResize}
+    StandardPopup{popup_name, {512.0f, 0.0f}, ui::PanelFlag::AlwaysAutoResize}
 {}
 
 osc::StandardPopup::StandardPopup(
     std::string_view popup_name,
     Vec2 dimensions,
-    ui::WindowFlags popup_flags) :
+    ui::PanelFlags panel_flags) :
 
     popup_name_{popup_name},
     dimensions_{dimensions},
     maybe_position_{std::nullopt},
-    popup_flags_{popup_flags},
+    panel_flags_{panel_flags},
     should_open_{false},
     should_close_{false},
     just_opened_{false},
@@ -78,7 +78,7 @@ bool osc::StandardPopup::impl_begin_popup()
         //
         // else, set the position every frame, because the __nonzero__ dimensions
         // will stretch out the modal accordingly
-        if (not (popup_flags_ & ui::WindowFlag::AlwaysAutoResize)) {
+        if (not (panel_flags_ & ui::PanelFlag::AlwaysAutoResize)) {
             ui::set_next_panel_size(
                 Vec2{dimensions_},
                 ui::Conditional::Appearing
@@ -92,7 +92,7 @@ bool osc::StandardPopup::impl_begin_popup()
 
         // try to begin the modal window
         impl_before_imgui_begin_popup();
-        const bool opened = ui::begin_popup_modal(popup_name_, nullptr, popup_flags_);
+        const bool opened = ui::begin_popup_modal(popup_name_, nullptr, panel_flags_);
         impl_after_imgui_begin_popup();
 
         if (not opened) {
@@ -117,7 +117,7 @@ bool osc::StandardPopup::impl_begin_popup()
 
         // try to begin the popup window
         impl_before_imgui_begin_popup();
-        const bool opened = ui::begin_popup(popup_name_, popup_flags_);
+        const bool opened = ui::begin_popup(popup_name_, panel_flags_);
         impl_after_imgui_begin_popup();
 
         // try to show popup

diff --git a/liboscar/UI/Popups/StandardPopup.h b/liboscar/UI/Popups/StandardPopup.h
@@ -31,7 +31,7 @@ namespace osc
         StandardPopup(
             std::string_view popup_name,
             Vec2 dimensions,
-            ui::WindowFlags
+            ui::PanelFlags
         );
 
     protected:
@@ -62,7 +62,7 @@ namespace osc
         std::string popup_name_;
         Vec2i dimensions_;
         std::optional<Vec2i> maybe_position_;
-        ui::WindowFlags popup_flags_;
+        ui::PanelFlags panel_flags_;
         bool should_open_;
         bool should_close_;
         bool just_opened_;

diff --git a/liboscar/UI/Tabs/ErrorTab.cpp b/liboscar/UI/Tabs/ErrorTab.cpp
@@ -52,7 +52,7 @@ class osc::ErrorTab::Impl final : public TabPrivate {
             ui::set_next_panel_pos(pos, ui::Conditional::Once, {0.5f, 1.0f});
             ui::set_next_panel_size({width, 0.0f});
 
-            if (ui::begin_panel("Error Log", nullptr, ui::WindowFlag::MenuBar)) {
+            if (ui::begin_panel("Error Log", nullptr, ui::PanelFlag::MenuBar)) {
                 log_viewer_.on_draw();
             }
             ui::end_panel();