Merge branch 'WerWolv:master' into master

paxcut · Oct 12, 2023 · 4a45638 · 4a45638
2 parents 7ca28de + 5a71cc2
commit 4a45638
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/plugins/builtin/source/content/tools_entries.cpp b/plugins/builtin/source/content/tools_entries.cpp
@@ -666,14 +666,12 @@ namespace hex::plugin::builtin {
             static std::string resultTitle, resultExtract;
             static std::future<HttpRequest::Result<std::string>> searchProcess;
             static bool extendedSearch = false;
-
-            std::string searchString;
+            static std::string searchString;
 
             ImGui::Header("hex.builtin.tools.wiki_explain.control"_lang, true);
 
-            bool startSearch;
+            bool startSearch = ImGui::InputTextIcon("##search", ICON_VS_SYMBOL_KEY, searchString, ImGuiInputTextFlags_EnterReturnsTrue);
 
-            startSearch = ImGui::InputTextIcon("##search", ICON_VS_SYMBOL_KEY, searchString, ImGuiInputTextFlags_EnterReturnsTrue);
             ImGui::SameLine();
 
             ImGui::BeginDisabled((searchProcess.valid() && searchProcess.wait_for(0s) != std::future_status::ready) || searchString.empty());
@@ -713,11 +711,13 @@ namespace hex::plugin::builtin {
 
                         resultTitle.clear();
                         resultExtract.clear();
+                        searchString.clear();
                     } else {
                         extendedSearch = false;
                         searchString.clear();
                     }
                 } catch (...) {
+                    searchString.clear();
                     resultTitle.clear();
                     resultExtract.clear();
                     extendedSearch = false;

diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp
@@ -273,7 +273,7 @@ namespace hex::plugin::builtin {
 
                             ImGui::TextFormatted("{}", tabProvider->getName().c_str());
 
-                            const auto &description = provider->getDataDescription();
+                            const auto &description = tabProvider->getDataDescription();
                             if (!description.empty()) {
                                 ImGui::Separator();
                                 if (ImGui::GetIO().KeyShift && !description.empty()) {

diff --git a/plugins/builtin/source/content/views/view_achievements.cpp b/plugins/builtin/source/content/views/view_achievements.cpp
@@ -91,7 +91,7 @@ namespace hex::plugin::builtin {
         auto tooltipSize = achievementSize * ImVec2(4, 0);
 
         // Draw achievement tooltip when hovering over it
-        if (ImGui::IsMouseHoveringRect(position, position + achievementSize)) {
+        if (ImGui::IsWindowHovered() && ImGui::IsMouseHoveringRect(position, position + achievementSize)) {
             ImGui::SetNextWindowPos(tooltipPos);
             ImGui::SetNextWindowSize(tooltipSize);
             if (ImGui::BeginTooltip()) {