From 57a997ecff6d1db2ff8bda2852695be1c9e202a3 Mon Sep 17 00:00:00 2001 From: w1naenator Date: Fri, 28 Mar 2025 17:48:27 +0200 Subject: [PATCH] CLang fix --- .../libraries/ime/ime_keyboard_layouts.cpp | 21 ++++++++----------- src/core/libraries/ime/ime_keyboard_layouts.h | 16 +++++++------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/core/libraries/ime/ime_keyboard_layouts.cpp b/src/core/libraries/ime/ime_keyboard_layouts.cpp index a6e4548ea..41cf784cb 100644 --- a/src/core/libraries/ime/ime_keyboard_layouts.cpp +++ b/src/core/libraries/ime/ime_keyboard_layouts.cpp @@ -67,11 +67,10 @@ const std::vector kUppercaseLayout = { // Row 6 {5, 0, 1, 1, "UP", "", KeyType::CursorUp}, //{5, 0, 1, 1, "▲", "", KeyType::CursorUp}, {5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown}, - {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, - {5, 3, 1, 1, "RT", "R1", - KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight}, + {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, + {5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight}, {5, 4, 1, 1, "KB", "", - KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, + KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, {5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions}, {5, 6, 1, 1, "CR", "R1", KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction}, @@ -145,11 +144,10 @@ const std::vector kLowercaseLayout = { // Row 6 {5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp}, {5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown}, - {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, - {5, 3, 1, 1, "RT", "R1", - KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight}, + {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, + {5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight}, {5, 4, 1, 1, "KB", "", - KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, + KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, {5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions}, {5, 6, 1, 1, "CR", "R1", KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction}, @@ -223,11 +221,10 @@ const std::vector kSymbols1Layout = { // Row 6 {5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp}, {5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown}, - {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, - {5, 3, 1, 1, "RT", "R1", - KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight}, + {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, + {5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight}, {5, 4, 1, 1, "KB", "", - KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, + KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, {5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions}, {5, 6, 1, 1, "CR", "R1", KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction}, diff --git a/src/core/libraries/ime/ime_keyboard_layouts.h b/src/core/libraries/ime/ime_keyboard_layouts.h index 0f51509c6..ebadfdb80 100644 --- a/src/core/libraries/ime/ime_keyboard_layouts.h +++ b/src/core/libraries/ime/ime_keyboard_layouts.h @@ -7,14 +7,14 @@ #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 - SymbolsLayout, // Switch to symbols layout - TextLayout, // Switch to text layout - Done, // Finish and close keyboard + Text, // Inserts character(s) into input buffer + Backspace, // Deletes last character + Space, // Adds space + Enter, // Submits input + Shift, // Toggle uppercase/lowercase + SymbolsLayout, // Switch to symbols layout + TextLayout, // Switch to text layout + Done, // Finish and close keyboard CursorLeft, CursorRight, CursorUp,