| @@ -64,7 +64,7 @@ public: | |||||
| ImGui::Text("Scroll: %f", io.MouseWheel); | ImGui::Text("Scroll: %f", io.MouseWheel); | ||||
| ImGui::Text("Maj: %s", io.KeyShift ? "true" : "false"); | ImGui::Text("Maj: %s", io.KeyShift ? "true" : "false"); | ||||
| ImGui::Text("Ctrl: %s", io.KeyCtrl ? "true" : "false"); | ImGui::Text("Ctrl: %s", io.KeyCtrl ? "true" : "false"); | ||||
| ImGui::Text("Clipboard %s", LolImGui::GetClipboard()); | |||||
| ImGui::Text("Clipboard %s", LolImGui::GetClipboard().C()); | |||||
| ImGui::InputText("base input", buf, 512); | ImGui::InputText("base input", buf, 512); | ||||
| } | } | ||||
| ImGui::End(); | ImGui::End(); | ||||
| @@ -1 +1 @@ | |||||
| Subproject commit cb7e1c18b57092da146307557b3e9d1fead7430f | |||||
| Subproject commit 6742ac4587de26f9bec2a12cb0b2f33a4d84df94 | |||||
| @@ -128,8 +128,9 @@ void LolImGui::Init() | |||||
| //Func pointer | //Func pointer | ||||
| io.RenderDrawListsFn = LolImGui::RenderDrawLists; | io.RenderDrawListsFn = LolImGui::RenderDrawLists; | ||||
| io.SetClipboardTextFn = LolImGui::SetClipboard; | |||||
| io.GetClipboardTextFn = LolImGui::GetClipboard; | |||||
| io.SetClipboardTextFn = LolImGui::SetClipboardCallback; | |||||
| io.GetClipboardTextFn = LolImGui::GetClipboardCallback; | |||||
| io.ClipboardUserData = &g_lolimgui->m_clipboard; | |||||
| } | } | ||||
| /* CALLBACKS | /* CALLBACKS | ||||
| @@ -154,14 +155,20 @@ void LolImGui::Shutdown() | |||||
| } | } | ||||
| //----------------------------------------------------------------------------- | //----------------------------------------------------------------------------- | ||||
| static String g_clipboard; | |||||
| void LolImGui::SetClipboard(const char* text) | |||||
| String LolImGui::GetClipboard() | |||||
| { | { | ||||
| g_clipboard = text; | |||||
| return g_lolimgui ? g_lolimgui->m_clipboard : ""; | |||||
| } | } | ||||
| const char* LolImGui::GetClipboard() | |||||
| void LolImGui::SetClipboardCallback(void *data, const char* text) | |||||
| { | |||||
| String *clipboard = (String *)data; | |||||
| *clipboard = text; | |||||
| } | |||||
| const char* LolImGui::GetClipboardCallback(void *data) | |||||
| { | { | ||||
| return g_clipboard.C(); | |||||
| String *clipboard = (String *)data; | |||||
| return clipboard->C(); | |||||
| } | } | ||||
| //----------------------------------------------------------------------------- | //----------------------------------------------------------------------------- | ||||
| @@ -137,13 +137,15 @@ public: | |||||
| static void Shutdown(); | static void Shutdown(); | ||||
| //------------------------------------------------------------------------- | //------------------------------------------------------------------------- | ||||
| static void SetClipboard(const char* text); | |||||
| static const char* GetClipboard(); | |||||
| static String GetClipboard(); | |||||
| protected: | protected: | ||||
| virtual void TickGame(float seconds); | virtual void TickGame(float seconds); | ||||
| virtual void TickDraw(float seconds, Scene &scene); | virtual void TickDraw(float seconds, Scene &scene); | ||||
| static void SetClipboardCallback(void *data, const char* text); | |||||
| static const char* GetClipboardCallback(void *data); | |||||
| static void RenderDrawLists(ImDrawData* draw_data); | static void RenderDrawLists(ImDrawData* draw_data); | ||||
| void RenderDrawListsMethod(ImDrawData* draw_data); | void RenderDrawListsMethod(ImDrawData* draw_data); | ||||
| @@ -172,6 +174,7 @@ protected: | |||||
| InputDevice* m_keyboard = nullptr; | InputDevice* m_keyboard = nullptr; | ||||
| InputProfile m_profile; | InputProfile m_profile; | ||||
| //map<ImGuiKey_, LolImGuiKey> m_keys; | //map<ImGuiKey_, LolImGuiKey> m_keys; | ||||
| String m_clipboard; | |||||
| }; | }; | ||||
| //----------------------------------------------------------------------------- | //----------------------------------------------------------------------------- | ||||