Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

fix: Prevent constants view from growing past the size of the screen

Browse Source 
Fixes #1025
This commit is contained in:
WerWolv 2023-04-10 21:30:27 +02:00
parent e7494be5e7
commit 349b5da810
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/source/window/window.cpp
View File

@ -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();
}

2
plugins/builtin/include/content/views/view_about.hpp
View File

@ -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:

4
plugins/builtin/include/content/views/view_command_palette.hpp
View File

@ -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

8
plugins/builtin/include/content/views/view_constants.hpp
View File

@ -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();

4
plugins/builtin/include/content/views/view_settings.hpp
View File

@ -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;

4
plugins/builtin/include/content/views/view_store.hpp
View File

@ -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", "");

2
plugins/builtin/source/content/views/view_constants.cpp
View File

@ -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<ViewConstants *>(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);