From 867807fb2b878f9aec8f62a44f218a3bd451ddeb Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 15 Jan 2021 10:30:31 -0500 Subject: [PATCH] WindowServer: Delete dead set_screen parameter --- Userland/Services/WindowServer/WindowManager.cpp | 9 ++------- Userland/Services/WindowServer/WindowManager.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index aa072fb0b6..b96ae13698 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -72,7 +72,7 @@ WindowManager::WindowManager(const Gfx::PaletteImpl& palette) { s_the = this; - reload_config(false); + reload_config(); Compositor::the().did_construct_window_manager({}); } @@ -91,16 +91,11 @@ NonnullRefPtr WindowManager::get_cursor(const String& name) return Cursor::create(*Gfx::Bitmap::load_from_file(s_default_cursor_path), s_default_cursor_path); } -void WindowManager::reload_config(bool set_screen) +void WindowManager::reload_config() { m_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini"); m_double_click_speed = m_config->read_num_entry("Input", "DoubleClickSpeed", 250); - - if (set_screen) { - set_resolution(m_config->read_num_entry("Screen", "Width", 1920), m_config->read_num_entry("Screen", "Height", 1080)); - } - m_hidden_cursor = get_cursor("Hidden"); m_arrow_cursor = get_cursor("Arrow"); m_hand_cursor = get_cursor("Hand"); diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h index 94e1f212d7..82f52464a5 100644 --- a/Userland/Services/WindowServer/WindowManager.h +++ b/Userland/Services/WindowServer/WindowManager.h @@ -82,7 +82,7 @@ public: Palette palette() const { return Palette(*m_palette); } RefPtr config() const { return m_config; } - void reload_config(bool); + void reload_config(); void add_window(Window&); void remove_window(Window&);