瀏覽代碼

LibGUI+WindowServer: Keep canonical WindowType enum in WindowServer

Having the same enum in two places was annoying. Let's just "using"
the WindowServer::WindowType enum into the GUI namespace.
Andreas Kling 4 年之前
父節點
當前提交
50a8e0e495
共有 2 個文件被更改,包括 7 次插入15 次删除
  1. 3 14
      Userland/Libraries/LibGUI/WindowType.h
  2. 4 1
      Userland/Services/WindowServer/WindowType.h

+ 3 - 14
Userland/Libraries/LibGUI/WindowType.h

@@ -26,21 +26,10 @@
 
 
 #pragma once
 #pragma once
 
 
+#include <Services/WindowServer/WindowType.h>
+
 namespace GUI {
 namespace GUI {
 
 
-// Keep this in sync with WindowServer::WindowType.
-enum class WindowType {
-    Invalid = 0,
-    Normal,
-    Menu,
-    WindowSwitcher,
-    Taskbar,
-    Tooltip,
-    Menubar,
-    MenuApplet,
-    Notification,
-    Desktop,
-    ToolWindow,
-};
+using WindowType = WindowServer::WindowType;
 
 
 }
 }

+ 4 - 1
Userland/Services/WindowServer/WindowType.h

@@ -26,7 +26,8 @@
 
 
 #pragma once
 #pragma once
 
 
-// Keep this in sync with GUI::WindowType.
+namespace WindowServer {
+
 enum class WindowType {
 enum class WindowType {
     Invalid = 0,
     Invalid = 0,
     Normal,
     Normal,
@@ -40,3 +41,5 @@ enum class WindowType {
     Desktop,
     Desktop,
     ToolWindow,
     ToolWindow,
 };
 };
+
+}