diff --git a/main/source/window/window.cpp b/main/source/window/window.cpp index eb5370a86..9223901a1 100644 --- a/main/source/window/window.cpp +++ b/main/source/window/window.cpp @@ -619,7 +619,7 @@ namespace hex { // Draw view if (view->isAvailable()) { - ImGui::SetNextWindowSizeConstraints(scaled(view->getMinSize()), scaled(view->getMaxSize())); + ImGui::SetNextWindowSizeConstraints(view->getMinSize(), view->getMaxSize()); view->drawContent(); } diff --git a/plugins/builtin/include/content/views/view_about.hpp b/plugins/builtin/include/content/views/view_about.hpp index a99b83ab9..3ceb98209 100644 --- a/plugins/builtin/include/content/views/view_about.hpp +++ b/plugins/builtin/include/content/views/view_about.hpp @@ -21,7 +21,7 @@ namespace hex::plugin::builtin { [[nodiscard]] bool hasViewMenuItemEntry() const override { return false; } [[nodiscard]] ImVec2 getMinSize() const override { - return { 400, 300 }; + return scaled({ 400, 300 }); } private: diff --git a/plugins/builtin/include/content/views/view_command_palette.hpp b/plugins/builtin/include/content/views/view_command_palette.hpp index 8ebb06948..a00e67d4b 100644 --- a/plugins/builtin/include/content/views/view_command_palette.hpp +++ b/plugins/builtin/include/content/views/view_command_palette.hpp @@ -22,8 +22,8 @@ namespace hex::plugin::builtin { [[nodiscard]] bool shouldProcess() const override { return true; } [[nodiscard]] bool hasViewMenuItemEntry() const override { return false; } - [[nodiscard]] ImVec2 getMinSize() const override { return { 400, 100 }; } - [[nodiscard]] ImVec2 getMaxSize() const override { return { 400, 100 }; } + [[nodiscard]] ImVec2 getMinSize() const override { return scaled({ 400, 100 }); } + [[nodiscard]] ImVec2 getMaxSize() const override { return scaled({ 400, 100 }); } private: enum class MatchType diff --git a/plugins/builtin/include/content/views/view_constants.hpp b/plugins/builtin/include/content/views/view_constants.hpp index b02f3376e..ec1e5f08e 100644 --- a/plugins/builtin/include/content/views/view_constants.hpp +++ b/plugins/builtin/include/content/views/view_constants.hpp @@ -28,6 +28,14 @@ namespace hex::plugin::builtin { void drawContent() override; + ImVec2 getMinSize() const override { + return scaled(ImVec2(300, 400)); + } + + ImVec2 getMaxSize() const override { + return { FLT_MAX, 800_scaled }; + } + private: void reloadConstants(); diff --git a/plugins/builtin/include/content/views/view_settings.hpp b/plugins/builtin/include/content/views/view_settings.hpp index 90ed80200..6bd8c8ee2 100644 --- a/plugins/builtin/include/content/views/view_settings.hpp +++ b/plugins/builtin/include/content/views/view_settings.hpp @@ -17,8 +17,8 @@ namespace hex::plugin::builtin { [[nodiscard]] bool isAvailable() const override { return true; } [[nodiscard]] bool hasViewMenuItemEntry() const override { return false; } - [[nodiscard]] ImVec2 getMinSize() const override { return { 700, 400 }; } - [[nodiscard]] ImVec2 getMaxSize() const override { return { 700, 400 }; } + [[nodiscard]] ImVec2 getMinSize() const override { return scaled({ 700, 400 }); } + [[nodiscard]] ImVec2 getMaxSize() const override { return scaled({ 700, 400 }); } private: bool m_restartRequested = false; diff --git a/plugins/builtin/include/content/views/view_store.hpp b/plugins/builtin/include/content/views/view_store.hpp index eb3af8f9a..a14c81fdf 100644 --- a/plugins/builtin/include/content/views/view_store.hpp +++ b/plugins/builtin/include/content/views/view_store.hpp @@ -44,8 +44,8 @@ namespace hex::plugin::builtin { [[nodiscard]] bool isAvailable() const override { return true; } [[nodiscard]] bool hasViewMenuItemEntry() const override { return false; } - [[nodiscard]] ImVec2 getMinSize() const override { return { 600, 400 }; } - [[nodiscard]] ImVec2 getMaxSize() const override { return { 900, 700 }; } + [[nodiscard]] ImVec2 getMinSize() const override { return scaled({ 600, 400 }); } + [[nodiscard]] ImVec2 getMaxSize() const override { return scaled({ 900, 700 }); } private: HttpRequest m_httpRequest = HttpRequest("GET", ""); diff --git a/plugins/builtin/source/content/views/view_constants.cpp b/plugins/builtin/source/content/views/view_constants.cpp index b965e2892..c2587f599 100644 --- a/plugins/builtin/source/content/views/view_constants.cpp +++ b/plugins/builtin/source/content/views/view_constants.cpp @@ -66,6 +66,7 @@ namespace hex::plugin::builtin { void ViewConstants::drawContent() { if (ImGui::Begin(View::toWindowName("hex.builtin.view.constants.name").c_str(), &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) { + ImGui::PushItemWidth(-1); ImGui::InputText( "##search", this->m_filter.data(), this->m_filter.capacity(), ImGuiInputTextFlags_CallbackEdit, [](ImGuiInputTextCallbackData *data) { auto &view = *static_cast(data->UserData); @@ -84,6 +85,7 @@ namespace hex::plugin::builtin { return 0; }, this); + ImGui::PopItemWidth(); if (ImGui::BeginTable("##strings", 4, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Sortable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg | ImGuiTableFlags_ScrollY)) { ImGui::TableSetupScrollFreeze(0, 1);