From a6581c2aacbe3f4941168278cb96d94d2b0154a2 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Thu, 17 Nov 2022 09:29:54 -0500 Subject: [PATCH] LibGUI: Paint text selections as active in Popups And hide TextEditor cursors in active windows when focus is preempted --- Userland/Libraries/LibGUI/TextEditor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibGUI/TextEditor.cpp b/Userland/Libraries/LibGUI/TextEditor.cpp index 6e53fec67b..e6ecc4cf98 100644 --- a/Userland/Libraries/LibGUI/TextEditor.cpp +++ b/Userland/Libraries/LibGUI/TextEditor.cpp @@ -727,8 +727,8 @@ void TextEditor::paint_event(PaintEvent& event) visual_line_rect.height() }; - Color background_color = window()->is_active() ? palette().selection() : palette().inactive_selection(); - Color text_color = window()->is_active() ? palette().selection_text() : palette().inactive_selection_text(); + Color background_color = is_focused() ? palette().selection() : palette().inactive_selection(); + Color text_color = is_focused() ? palette().selection_text() : palette().inactive_selection_text(); painter.fill_rect(selection_rect, background_color); @@ -748,7 +748,7 @@ void TextEditor::paint_event(PaintEvent& event) }); } - if (is_enabled() && is_focused() && m_cursor_state && !is_displayonly()) + if (is_enabled() && is_focused() && !focus_preempted() && m_cursor_state && !is_displayonly()) painter.fill_rect(cursor_content_rect(), palette().text_cursor()); }