apps/about.cpp

@@ -5,8 +5,6 @@
 #include <ui/Label.h>
 #include <ui/Layout.h>
 
-static constexpr ui::Color BACKGROUND_COLOR = ui::Color::from_rgb(89, 89, 89);
-
 Result<int> luna_main(int argc, char** argv)
 {
     ui::App app;
@@ -16,7 +14,7 @@ Result<int> luna_main(int argc, char** argv)
     app.set_main_window(window);
 
     window->set_title("About");
-    window->set_background(BACKGROUND_COLOR);
+    window->set_background(ui::CYAN);
 
     utsname info;
     uname(&info);
@@ -24,7 +22,7 @@ Result<int> luna_main(int argc, char** argv)
     ui::VerticalLayout main_layout;
     window->set_main_widget(main_layout);
 
-    ui::Label title("About Luna", ui::WHITE, ui::VerticalAlignment::Center, ui::HorizontalAlignment::Center,
+    ui::Label title("About Luna", ui::VerticalAlignment::Center, ui::HorizontalAlignment::Center,
                     ui::Font::default_bold_font());
     main_layout.add_widget(title);
 

apps/taskbar.cpp

@@ -8,8 +8,6 @@
 #include <ui/Image.h>
 #include <ui/Layout.h>
 
-static constexpr ui::Color TASKBAR_COLOR = ui::Color::from_rgb(83, 83, 83);
-
 void sigchld_handler(int)
 {
     wait(nullptr);
@@ -28,7 +26,7 @@ Result<int> luna_main(int argc, char** argv)
 
     auto window = TRY(ui::Window::create(bar, false));
     app.set_main_window(window);
-    window->set_background(TASKBAR_COLOR);
+    window->set_background(ui::GRAY);
 
     ui::HorizontalLayout layout(ui::AdjustHeight::Yes, ui::AdjustWidth::No);
     window->set_main_widget(layout);

kernel/src/memory/MemoryManager.cpp

@@ -157,13 +157,6 @@ namespace MemoryManager
         used_mem += ARCH_PAGE_SIZE;
         free_mem -= ARCH_PAGE_SIZE;
 
-        if (free_mem < 1024 * 1024)
-        {
-            // Less than 1 MiB of free memory! Let's start clearing caches...
-            kwarnln("Less than 1 MiB of free memory, clearing caches to try to gain extra memory");
-            Scheduler::signal_oom_thread();
-        }
-
         return index * ARCH_PAGE_SIZE;
     }
 

libui/include/ui/Label.h

@@ -22,7 +22,7 @@ namespace ui
     class Label final : public Widget
     {
       public:
-        Label(StringView text, ui::Color color = ui::WHITE, VerticalAlignment valign = VerticalAlignment::Center,
+        Label(StringView text, VerticalAlignment valign = VerticalAlignment::Center,
               HorizontalAlignment halign = HorizontalAlignment::Center, SharedPtr<Font> font = Font::default_font());
 
         void set_text(StringView text)
@@ -36,7 +36,6 @@ namespace ui
         StringView m_text;
         VerticalAlignment m_valign;
         HorizontalAlignment m_halign;
-        ui::Color m_color;
         SharedPtr<Font> m_font;
     };
 }

libui/src/Label.cpp

@@ -12,9 +12,8 @@
 
 namespace ui
 {
-    Label::Label(StringView text, ui::Color color, VerticalAlignment valign, HorizontalAlignment halign,
-                 SharedPtr<Font> font)
-        : m_text(text), m_valign(valign), m_halign(halign), m_color(color), m_font(font)
+    Label::Label(StringView text, VerticalAlignment valign, HorizontalAlignment halign, SharedPtr<Font> font)
+        : m_text(text), m_valign(valign), m_halign(halign), m_font(font)
     {
     }
 
@@ -31,7 +30,7 @@ namespace ui
         wchar_t buf[4096];
         TRY(decoder.decode(buf, sizeof(buf)));
 
-        m_font->render(buf, m_color, subcanvas);
+        m_font->render(buf, ui::BLACK, subcanvas);
         return {};
     }
 }

terminal/TerminalWidget.cpp

@@ -88,11 +88,7 @@ Result<void> TerminalWidget::init(char* const* args)
 
 Result<ui::EventResult> TerminalWidget::handle_key_event(const ui::KeyEventRequest& request)
 {
-    // Avoid handling "key released" events
     if (!request.pressed) return ui::EventResult::DidNotHandle;
-    // Non-printable key or key that has no special character (unlike Tab or Enter). We exit early to avoid inserting an
-    // invalid zero byte into the terminal input (this would also happen on Shift or Ctrl keypresses).
-    if (request.letter == '\0') return ui::EventResult::DidNotHandle;
 
     query_termios();
 

wind/Window.cpp

@@ -7,8 +7,6 @@
 
 LinkedList<Window> g_windows;
 
-static constexpr ui::Color TITLEBAR_COLOR = ui::Color::from_rgb(53, 53, 53);
-
 void Window::draw(ui::Canvas& screen)
 {
     dirty = false;
@@ -23,10 +21,10 @@ void Window::draw(ui::Canvas& screen)
     auto font = ui::Font::default_font();
 
     auto titlebar_canvas = window.subcanvas(titlebar);
-    titlebar_canvas.fill(TITLEBAR_COLOR);
+    titlebar_canvas.fill(ui::GRAY);
 
     auto textarea = titlebar_canvas.subcanvas(ui::Rect { 10, 10, titlebar_canvas.width - 10, titlebar_canvas.height });
-    font->render(buffer, ui::WHITE, textarea);
+    font->render(buffer, ui::BLACK, textarea);
 
     static SharedPtr<ui::Image> g_close_icon;