diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-01-10 23:19:29 +0100 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-01-10 23:19:29 +0100 |
commit | f6d2c3ed87b03062dee0bb190aa45ce1f362ada3 (patch) | |
tree | e3ca5887c5b75e996a6d0a7a61565986cff4d27e /Widgets/Color.cpp | |
parent | 8626e95509c5984c331b23585bd530571239129d (diff) | |
download | serenity-f6d2c3ed87b03062dee0bb190aa45ce1f362ada3.zip |
Hook everything up to run the GUI on top of the kernel.
Okay things kinda sorta work. Both Bochs and QEMU now boot into GUI mode.
There's a ton of stuff that doesn't make sense and so many things to rework.
Still it's quite cool to have made it this far. :^)
Diffstat (limited to 'Widgets/Color.cpp')
-rw-r--r-- | Widgets/Color.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Widgets/Color.cpp b/Widgets/Color.cpp index dd7f5d5f79..f096849285 100644 --- a/Widgets/Color.cpp +++ b/Widgets/Color.cpp @@ -6,7 +6,7 @@ Color::Color(byte r, byte g, byte b) #ifdef USE_SDL m_value = SDL_MapRGB(FrameBuffer::the().surface()->format, r, g, b); #else -#error FIXME: Implement + m_value = (r << 16) | (g << 8) | b; #endif } @@ -33,6 +33,6 @@ Color::Color(NamedColor named) #ifdef USE_SDL m_value = SDL_MapRGB(FrameBuffer::the().surface()->format, rgb.r, rgb.g, rgb.g); #else -#error FIXME: Implement + m_value = (rgb.r << 16) | (rgb.g << 8) | rgb.b; #endif } |