forked from Lainports/opnsense-ports
64 lines
2.6 KiB
C++
64 lines
2.6 KiB
C++
--- ui/views/controls/textfield/textfield.cc.orig 2022-10-24 13:33:33 UTC
|
|
+++ ui/views/controls/textfield/textfield.cc
|
|
@@ -71,7 +71,7 @@
|
|
#include "base/win/win_util.h"
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
|
|
#include "ui/linux/linux_ui.h"
|
|
#endif
|
|
@@ -164,7 +164,7 @@ bool IsControlKeyModifier(int flags) {
|
|
// Control-modified key combination, but we cannot extend it to other platforms
|
|
// as Control has different meanings and behaviors.
|
|
// https://crrev.com/2580483002/#msg46
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
return flags & ui::EF_CONTROL_DOWN;
|
|
#else
|
|
return false;
|
|
@@ -707,7 +707,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
|
|
if (!textfield)
|
|
return handled;
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
auto* linux_ui = ui::LinuxUi::instance();
|
|
std::vector<ui::TextEditCommandAuraLinux> commands;
|
|
if (!handled && linux_ui &&
|
|
@@ -851,7 +851,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
|
|
}
|
|
|
|
bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
// Skip any accelerator handling that conflicts with custom keybindings.
|
|
auto* linux_ui = ui::LinuxUi::instance();
|
|
std::vector<ui::TextEditCommandAuraLinux> commands;
|
|
@@ -1721,7 +1721,7 @@ bool Textfield::ShouldDoLearning() {
|
|
return false;
|
|
}
|
|
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// TODO(https://crbug.com/952355): Implement this method to support Korean IME
|
|
// reconversion feature on native text fields (e.g. find bar).
|
|
bool Textfield::SetCompositionFromExistingText(
|
|
@@ -2220,14 +2220,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
|
|
#endif
|
|
return ui::TextEditCommand::DELETE_BACKWARD;
|
|
}
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// Only erase by line break on Linux and ChromeOS.
|
|
if (shift)
|
|
return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
|
|
#endif
|
|
return ui::TextEditCommand::DELETE_WORD_BACKWARD;
|
|
case ui::VKEY_DELETE:
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// Only erase by line break on Linux and ChromeOS.
|
|
if (shift && control)
|
|
return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
|