From 5ac1dd1e98a72df8e7e267175e893dbec35b0915 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Sun, 4 Jun 2023 19:19:42 -0700
Subject: [PATCH] ui: Fix MainMenuSnapshotsView member visibility
---
ui/xui/main-menu.cc | 4 ++--
ui/xui/main-menu.hh | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ui/xui/main-menu.cc b/ui/xui/main-menu.cc
index c99f9ed10b..c14c4bde47 100644
--- a/ui/xui/main-menu.cc
+++ b/ui/xui/main-menu.cc
@@ -747,7 +747,7 @@ void MainMenuSnapshotsView::ClearSearch()
}
}
-static int MainMenuSnapshotsViewUpdateSearchBox(ImGuiInputTextCallbackData *data)
+int MainMenuSnapshotsView::OnSearchTextUpdate(ImGuiInputTextCallbackData *data)
{
GError *gerr = NULL;
MainMenuSnapshotsView *win = (MainMenuSnapshotsView*)data->UserData;
@@ -804,7 +804,7 @@ void MainMenuSnapshotsView::Draw()
ImGui::PushFont(g_font_mgr.m_menu_font_small);
ImGui::InputTextWithHint("##search", "Search or name new snapshot...",
&m_search_buf, ImGuiInputTextFlags_CallbackEdit,
- &MainMenuSnapshotsViewUpdateSearchBox, this);
+ &OnSearchTextUpdate, this);
bool snapshot_with_create_name_exists = false;
for (int i = 0; i < g_snapshot_mgr.m_snapshots_len; ++i) {
diff --git a/ui/xui/main-menu.hh b/ui/xui/main-menu.hh
index 63c4040fd0..7be564701c 100644
--- a/ui/xui/main-menu.hh
+++ b/ui/xui/main-menu.hh
@@ -104,20 +104,21 @@ public:
class MainMenuSnapshotsView : public virtual MainMenuTabView
{
protected:
+ GRegex *m_search_regex;
uint32_t m_current_title_id;
std::string m_current_title_name;
std::string m_search_buf;
-private:
void ClearSearch();
void DrawSnapshotContextMenu(QEMUSnapshotInfo *snapshot, XemuSnapshotData *data, int current_snapshot_binding);
+ bool BigSnapshotButton(QEMUSnapshotInfo *snapshot, XemuSnapshotData *data, int current_snapshot_binding);
+ static int OnSearchTextUpdate(ImGuiInputTextCallbackData *data);
public:
- GRegex *m_search_regex;
MainMenuSnapshotsView();
~MainMenuSnapshotsView();
- bool BigSnapshotButton(QEMUSnapshotInfo *snapshot, XemuSnapshotData *data, int current_snapshot_binding);
void Draw() override;
+
};
class MainMenuSystemView : public virtual MainMenuTabView