From 2ac099264dd8c674c300cd78ec87ecdb18680d56 Mon Sep 17 00:00:00 2001 From: w1naenator Date: Wed, 2 Apr 2025 18:08:39 +0300 Subject: [PATCH] CLang fixes --- src/core/libraries/ime/ime_keyboard_layouts.cpp | 10 +++++----- src/core/libraries/ime/ime_keyboard_layouts.h | 14 +++++++------- src/core/libraries/ime/ime_keyboard_ui.cpp | 4 ++-- src/core/libraries/ime/ime_keyboard_ui.h | 7 +++---- src/core/libraries/ime/ime_ui.cpp | 4 ---- src/imgui/renderer/imgui_core.cpp | 3 +-- 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/core/libraries/ime/ime_keyboard_layouts.cpp b/src/core/libraries/ime/ime_keyboard_layouts.cpp index 87ea2931a..0247ea8a5 100644 --- a/src/core/libraries/ime/ime_keyboard_layouts.cpp +++ b/src/core/libraries/ime/ime_keyboard_layouts.cpp @@ -364,13 +364,13 @@ const std::vector kSymbols2Layout = { //{3, 0, 1, 1, "←", "", KeyType::Symbols1Layout, {}}, {3, 1, 1, 1, "¢", "", KeyType::Text, {}}, {3, 2, 1, 1, "¤", "", KeyType::Text, {}}, - {3, 3, 1, 1, "’", "", KeyType::Text, {}},//not sure - {3, 4, 1, 1, "‘", "", KeyType::Text, {}},//not sure - {3, 5, 1, 1, "‛", "", KeyType::Text, {}},//not sure - {3, 6, 1, 1, "‚", "", KeyType::Text, {}},//not sure + {3, 3, 1, 1, "’", "", KeyType::Text, {}}, // not sure + {3, 4, 1, 1, "‘", "", KeyType::Text, {}}, // not sure + {3, 5, 1, 1, "‛", "", KeyType::Text, {}}, // not sure + {3, 6, 1, 1, "‚", "", KeyType::Text, {}}, // not sure {3, 7, 1, 1, "№", "", KeyType::Text, {}}, {3, 8, 1, 1, "", "", KeyType::Disabled, {}}, - {3, 9, 1, 1, "", "", KeyType::Disabled,{}}, + {3, 9, 1, 1, "", "", KeyType::Disabled, {}}, // Row 5 {4, 0, 1, 1, "", "", KeyType::Disabled, {}}, diff --git a/src/core/libraries/ime/ime_keyboard_layouts.h b/src/core/libraries/ime/ime_keyboard_layouts.h index 3da681219..7d4e8d8f5 100644 --- a/src/core/libraries/ime/ime_keyboard_layouts.h +++ b/src/core/libraries/ime/ime_keyboard_layouts.h @@ -8,15 +8,15 @@ #include enum class KeyType { - Text, // Inserts character(s) into input buffer - Backspace, // Deletes last character - Space, // Adds space - Enter, // Submits input - Shift, // Toggle uppercase/lowercase + Text, // Inserts character(s) into input buffer + Backspace, // Deletes last character + Space, // Adds space + Enter, // Submits input + Shift, // Toggle uppercase/lowercase Symbols1Layout, // Switch to symbols layout Symbols2Layout, // Switch to symbols layout - TextLayout, // Switch to text layout - Done, // Finish and close keyboard + TextLayout, // Switch to text layout + Done, // Finish and close keyboard CursorLeft, CursorRight, CursorUp, diff --git a/src/core/libraries/ime/ime_keyboard_ui.cpp b/src/core/libraries/ime/ime_keyboard_ui.cpp index 08185c6ed..066bedc4e 100644 --- a/src/core/libraries/ime/ime_keyboard_ui.cpp +++ b/src/core/libraries/ime/ime_keyboard_ui.cpp @@ -3,10 +3,10 @@ #include #include +#include "ime_common.h" #include "ime_keyboard_layouts.h" #include "ime_keyboard_ui.h" #include "ime_ui.h" // for ImeState -#include "ime_common.h" using namespace ImGui; @@ -127,7 +127,7 @@ void RenderKeyboardLayout(const std::vector& layout, char* buffer, std::siz break; case KeyType::ToggleKeyboard: kb_mode = (kb_mode == KeyboardMode::Letters1) ? KeyboardMode::Symbols1 - : KeyboardMode::Letters1; + : KeyboardMode::Letters1; break; default: break; diff --git a/src/core/libraries/ime/ime_keyboard_ui.h b/src/core/libraries/ime/ime_keyboard_ui.h index bbe6f7852..8b4f4af3e 100644 --- a/src/core/libraries/ime/ime_keyboard_ui.h +++ b/src/core/libraries/ime/ime_keyboard_ui.h @@ -6,19 +6,18 @@ #include #include #include -#include "core/libraries/pad/pad.h" -#include "ime_keyboard_layouts.h" #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/ime/ime_common.h" +#include "core/libraries/pad/pad.h" +#include "ime_keyboard_layouts.h" enum class KeyboardMode { Letters1, Letters2, Symbols1, Symbols2 }; void DrawVirtualKeyboard(char* buffer, std::size_t buffer_capacity, bool* input_changed, KeyboardMode& kb_mode, bool& shift_enabled, bool* done_pressed); - void RenderKeyboardLayout(const std::vector& layout, char* buffer, std::size_t buffer_capacity, bool* input_changed, KeyboardMode& kb_mode, bool& shift_enabled, bool* done_pressed); \ No newline at end of file diff --git a/src/core/libraries/ime/ime_ui.cpp b/src/core/libraries/ime/ime_ui.cpp index a3b1e2e92..918abe191 100644 --- a/src/core/libraries/ime/ime_ui.cpp +++ b/src/core/libraries/ime/ime_ui.cpp @@ -230,10 +230,6 @@ void ImeUi::DrawKeyboard() { } } - - - - int ImeUi::InputTextCallback(ImGuiInputTextCallbackData* data) { ImeUi* ui = static_cast(data->UserData); ASSERT(ui); diff --git a/src/imgui/renderer/imgui_core.cpp b/src/imgui/renderer/imgui_core.cpp index 9f2c961cc..28fdc618d 100644 --- a/src/imgui/renderer/imgui_core.cpp +++ b/src/imgui/renderer/imgui_core.cpp @@ -69,7 +69,7 @@ void Initialize(const ::Vulkan::Instance& instance, const Frontend::WindowSDL& w rb.AddRanges(io.Fonts->GetGlyphRangesKorean()); rb.AddRanges(io.Fonts->GetGlyphRangesJapanese()); rb.AddRanges(io.Fonts->GetGlyphRangesCyrillic()); - //For keyboard + // For keyboard rb.AddChar(U'×'); rb.AddChar(U'○'); rb.AddChar(U'△'); @@ -104,7 +104,6 @@ void Initialize(const ::Vulkan::Instance& instance, const Frontend::WindowSDL& w rb.AddChar(U'‚'); rb.AddChar(U'№'); - ImVector ranges{}; rb.BuildRanges(&ranges); ImFontConfig font_cfg{};