From 23b31367b2a84c9f76fd60aa0ac5667aeb4ad0af Mon Sep 17 00:00:00 2001
From: w1naenator <valdis.bogdans@hotmail.com>
Date: Sun, 20 Apr 2025 01:38:13 +0300
Subject: [PATCH] Full redesign

---
 src/core/libraries/ime/ime_dialog_ui.cpp      |  1 -
 src/core/libraries/ime/ime_dialog_ui.h        | 12 ----------
 .../libraries/ime/ime_keyboard_layouts.cpp    |  1 +
 src/core/libraries/ime/ime_keyboard_layouts.h | 22 -------------------
 src/core/libraries/ime/ime_keyboard_ui.cpp    |  2 --
 src/core/libraries/ime/ime_keyboard_ui.h      |  8 ++-----
 src/core/libraries/ime/ime_ui.cpp             |  1 -
 src/core/libraries/ime/ime_ui.h               |  1 -
 8 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/src/core/libraries/ime/ime_dialog_ui.cpp b/src/core/libraries/ime/ime_dialog_ui.cpp
index 9bffc8959..89aba7cbf 100644
--- a/src/core/libraries/ime/ime_dialog_ui.cpp
+++ b/src/core/libraries/ime/ime_dialog_ui.cpp
@@ -517,7 +517,6 @@ void ImeDialogUi::OnVirtualKeyEvent(const VirtualKeyEvent* evt) {
     /* Up is available if you need it later; currently ignored */
 }
 
-/* draw keyboard in a sub‑ID scope */
 void ImeDialogUi::DrawVirtualKeyboardSection() {
     ImGui::PushID("VirtualKeyboardSection");
     DrawVirtualKeyboard(kb_mode, state->type, shift_state, kb_language, KeyboardCallbackBridge,
diff --git a/src/core/libraries/ime/ime_dialog_ui.h b/src/core/libraries/ime/ime_dialog_ui.h
index 0c7c26a71..0984602ce 100644
--- a/src/core/libraries/ime/ime_dialog_ui.h
+++ b/src/core/libraries/ime/ime_dialog_ui.h
@@ -158,18 +158,6 @@ private:
     ShiftState shift_state = ShiftState::None;
     u64 kb_language = 0;
     KeyboardStyle kb_style;
-    /* KeyboardStyle kb_style{
-        .layout_width  = 500.0f,
-        .layout_height = 250.0f,
-        .key_spacing   = 5.0f,
-        .color_text             = IM_COL32(225,225,225,255),
-        .color_line             = IM_COL32( 88, 88, 88,255),
-        .color_button_default   = IM_COL32( 35, 35, 35,255),
-        .color_button_function  = IM_COL32( 50, 50, 50,255),
-        .color_special          = IM_COL32(  0,140,200,255),
-        .use_button_symbol_color= false,
-        .color_button_symbol    = IM_COL32( 60, 60, 60,255),
-    };*/
 
     void DrawVirtualKeyboardSection();
     void DrawPredictionBarAnCancelButton();
diff --git a/src/core/libraries/ime/ime_keyboard_layouts.cpp b/src/core/libraries/ime/ime_keyboard_layouts.cpp
index 7642fcc22..7d009119a 100644
--- a/src/core/libraries/ime/ime_keyboard_layouts.cpp
+++ b/src/core/libraries/ime/ime_keyboard_layouts.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <imgui.h>
+
 #include "ime_keyboard_layouts.h"
 
 int c16rtomb(char* out, char16_t ch) {
diff --git a/src/core/libraries/ime/ime_keyboard_layouts.h b/src/core/libraries/ime/ime_keyboard_layouts.h
index a727c4e1e..73e83ec82 100644
--- a/src/core/libraries/ime/ime_keyboard_layouts.h
+++ b/src/core/libraries/ime/ime_keyboard_layouts.h
@@ -8,28 +8,6 @@
 #include <imgui.h>
 #include "common/types.h"
 
-/*
-enum class OrbisImeKeyEntryType : u8 {
-    ORBIS_IME_KEY_TYPE_CHARACTER = 0,
-    ORBIS_IME_KEY_TYPE_FUNCTION = 1,
-    ORBIS_IME_KEY_TYPE_DISABLED = 2
-};
-*/
-/*
-struct OrbisImeKeyEntry {
-    u16 keycode;
-    char16_t character;
-    OrbisImeKeyEntryType type;
-    u8 row;
-    u8 col;
-    u8 colspan;
-    u8 rowspan;
-    const char* label;
-    const char* controller_hint;
-    OrbisPadButtonDataOffset bound_buttons[2];
-};
-*/
-
 enum class KeyType : u8 { Character = 0, Function = 1, Disabled = 2 };
 
 struct KeyEntry {
diff --git a/src/core/libraries/ime/ime_keyboard_ui.cpp b/src/core/libraries/ime/ime_keyboard_ui.cpp
index 68674488c..927df0feb 100644
--- a/src/core/libraries/ime/ime_keyboard_ui.cpp
+++ b/src/core/libraries/ime/ime_keyboard_ui.cpp
@@ -7,8 +7,6 @@
 #include "ime_dialog.h"
 #include "ime_keyboard_layouts.h"
 #include "ime_keyboard_ui.h"
-#include "ime_ui.h" // for ImeState
-
 using namespace ImGui;
 
 /**
diff --git a/src/core/libraries/ime/ime_keyboard_ui.h b/src/core/libraries/ime/ime_keyboard_ui.h
index 9e8fdef86..c2507c346 100644
--- a/src/core/libraries/ime/ime_keyboard_ui.h
+++ b/src/core/libraries/ime/ime_keyboard_ui.h
@@ -3,12 +3,8 @@
 #include <cstddef>
 #include <cstdint>
 #include <vector>
-#include "core/libraries/ime/ime.h"
-#include "core/libraries/ime/ime_common.h"
-#include "core/libraries/ime/ime_error.h"
-#include "core/libraries/ime/ime_ui.h"
-#include "core/libraries/pad/pad.h"
-#include "ime_keyboard_layouts.h"
+
+#include "core/libraries/ime/ime_keyboard_layouts.h"
 
 /**
  * KeyboardMode: which layout we show (letters, accents, symbols, etc.)
diff --git a/src/core/libraries/ime/ime_ui.cpp b/src/core/libraries/ime/ime_ui.cpp
index eb6680dea..811370098 100644
--- a/src/core/libraries/ime/ime_ui.cpp
+++ b/src/core/libraries/ime/ime_ui.cpp
@@ -249,5 +249,4 @@ int ImeUi::InputTextCallback(ImGuiInputTextCallbackData* data) {
 void ImeUi::Free() {
     RemoveLayer(this);
 }
-
 }; // namespace Libraries::Ime
\ No newline at end of file
diff --git a/src/core/libraries/ime/ime_ui.h b/src/core/libraries/ime/ime_ui.h
index 3eea22b8c..880e623d6 100644
--- a/src/core/libraries/ime/ime_ui.h
+++ b/src/core/libraries/ime/ime_ui.h
@@ -72,5 +72,4 @@ private:
 
     static int InputTextCallback(ImGuiInputTextCallbackData* data);
 };
-
 }; // namespace Libraries::Ime
\ No newline at end of file