From 38f11cc1ba31e13e0f748781a654a98eb3a45d19 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Thu, 11 Mar 2021 18:50:23 +0100
Subject: Everywhere: Rename "logo" key to "super" key

This seems to be the most common way to refer to this key, so let's
call it what people actually call it.
---
 Userland/Libraries/LibGUI/Event.cpp         | 4 ++--
 Userland/Libraries/LibGUI/Event.h           | 4 ++--
 Userland/Libraries/LibGUI/Shortcut.cpp      | 4 ++--
 Userland/Libraries/LibGUI/Widget.cpp        | 2 +-
 Userland/Libraries/LibGUI/Window.cpp        | 2 +-
 Userland/Libraries/LibVT/TerminalWidget.cpp | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Userland/Libraries')

diff --git a/Userland/Libraries/LibGUI/Event.cpp b/Userland/Libraries/LibGUI/Event.cpp
index 4b5ed888a5..81e92036ef 100644
--- a/Userland/Libraries/LibGUI/Event.cpp
+++ b/Userland/Libraries/LibGUI/Event.cpp
@@ -52,8 +52,8 @@ String KeyEvent::to_string() const
         parts.append("Shift");
     if (m_modifiers & Mod_Alt)
         parts.append("Alt");
-    if (m_modifiers & Mod_Logo)
-        parts.append("Logo");
+    if (m_modifiers & Mod_Super)
+        parts.append("Super");
 
     if (auto* key_name = key_code_to_string(static_cast<KeyCode>(m_key)))
         parts.append(key_name);
diff --git a/Userland/Libraries/LibGUI/Event.h b/Userland/Libraries/LibGUI/Event.h
index 8ce2cb49bf..b8898f7bde 100644
--- a/Userland/Libraries/LibGUI/Event.h
+++ b/Userland/Libraries/LibGUI/Event.h
@@ -290,7 +290,7 @@ public:
     bool ctrl() const { return m_modifiers & Mod_Ctrl; }
     bool alt() const { return m_modifiers & Mod_Alt; }
     bool shift() const { return m_modifiers & Mod_Shift; }
-    bool logo() const { return m_modifiers & Mod_Logo; }
+    bool super() const { return m_modifiers & Mod_Super; }
     u8 modifiers() const { return m_modifiers; }
     u32 code_point() const { return m_code_point; }
     String text() const
@@ -331,7 +331,7 @@ public:
     bool ctrl() const { return m_modifiers & Mod_Ctrl; }
     bool alt() const { return m_modifiers & Mod_Alt; }
     bool shift() const { return m_modifiers & Mod_Shift; }
-    bool logo() const { return m_modifiers & Mod_Logo; }
+    bool super() const { return m_modifiers & Mod_Super; }
     unsigned modifiers() const { return m_modifiers; }
     int wheel_delta() const { return m_wheel_delta; }
 
diff --git a/Userland/Libraries/LibGUI/Shortcut.cpp b/Userland/Libraries/LibGUI/Shortcut.cpp
index 5dfc3a5931..ad4be67134 100644
--- a/Userland/Libraries/LibGUI/Shortcut.cpp
+++ b/Userland/Libraries/LibGUI/Shortcut.cpp
@@ -41,8 +41,8 @@ String Shortcut::to_string() const
         parts.append("Shift");
     if (m_modifiers & Mod_Alt)
         parts.append("Alt");
-    if (m_modifiers & Mod_Logo)
-        parts.append("Logo");
+    if (m_modifiers & Mod_Super)
+        parts.append("Super");
 
     if (auto* key_name = key_code_to_string(m_key))
         parts.append(key_name);
diff --git a/Userland/Libraries/LibGUI/Widget.cpp b/Userland/Libraries/LibGUI/Widget.cpp
index 151f200b48..ccf85c4772 100644
--- a/Userland/Libraries/LibGUI/Widget.cpp
+++ b/Userland/Libraries/LibGUI/Widget.cpp
@@ -445,7 +445,7 @@ void Widget::hide_event(HideEvent&)
 
 void Widget::keydown_event(KeyEvent& event)
 {
-    if (!event.alt() && !event.ctrl() && !event.logo()) {
+    if (!event.alt() && !event.ctrl() && !event.super()) {
         if (event.key() == KeyCode::Key_Tab) {
             if (event.shift())
                 focus_previous_widget(FocusSource::Keyboard, false);
diff --git a/Userland/Libraries/LibGUI/Window.cpp b/Userland/Libraries/LibGUI/Window.cpp
index f88f7b5004..89d10c3ec7 100644
--- a/Userland/Libraries/LibGUI/Window.cpp
+++ b/Userland/Libraries/LibGUI/Window.cpp
@@ -422,7 +422,7 @@ void Window::handle_multi_paint_event(MultiPaintEvent& event)
 
 void Window::handle_key_event(KeyEvent& event)
 {
-    if (!m_focused_widget && event.type() == Event::KeyDown && event.key() == Key_Tab && !event.ctrl() && !event.alt() && !event.logo()) {
+    if (!m_focused_widget && event.type() == Event::KeyDown && event.key() == Key_Tab && !event.ctrl() && !event.alt() && !event.super()) {
         focus_a_widget_if_possible(FocusSource::Keyboard);
         return;
     }
diff --git a/Userland/Libraries/LibVT/TerminalWidget.cpp b/Userland/Libraries/LibVT/TerminalWidget.cpp
index b9e09e716b..9ee1e1ee90 100644
--- a/Userland/Libraries/LibVT/TerminalWidget.cpp
+++ b/Userland/Libraries/LibVT/TerminalWidget.cpp
@@ -266,7 +266,7 @@ void TerminalWidget::keydown_event(GUI::KeyEvent& event)
 
     m_terminal.handle_key_press(event.key(), event.code_point(), event.modifiers());
 
-    if (event.key() != Key_Control && event.key() != Key_Alt && event.key() != Key_LeftShift && event.key() != Key_RightShift && event.key() != Key_Logo)
+    if (event.key() != Key_Control && event.key() != Key_Alt && event.key() != Key_LeftShift && event.key() != Key_RightShift && event.key() != Key_Super)
         scroll_to_bottom();
 }
 
-- 
cgit v1.2.3