Adjust some theme colors

dpjudas · Jul 21, 2024 · 15f0d47 · 15f0d47
1 parent a7bfed4
commit 15f0d47
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/SurrealEngine/EditorApp.cpp b/SurrealEngine/EditorApp.cpp
@@ -15,7 +15,7 @@ int EditorApp::main(Array<std::string> args)
 	auto backend = DisplayBackend::TryCreateBackend();
 	DisplayBackend::Set(std::move(backend));
 	InitWidgetResources();
-	WidgetTheme::SetTheme(std::make_unique<LightWidgetTheme>());
+	WidgetTheme::SetTheme(std::make_unique<DarkWidgetTheme>());
 
 	try
 	{
@@ -29,7 +29,7 @@ int EditorApp::main(Array<std::string> args)
 
 			auto editorWindow = std::make_unique<EditorMainWindow>();
 			editorWindow->SetFrameGeometry(Rect::xywh(0.0, 0.0, 1024.0, 768.0));
-			editorWindow->Show();
+			editorWindow->ShowMaximized();
 
 			DisplayWindow::RunLoop();
 		}

diff --git a/SurrealEngine/UI/Editor/Editor2DViewport.cpp b/SurrealEngine/UI/Editor/Editor2DViewport.cpp
@@ -15,7 +15,7 @@ Editor2DViewport::~Editor2DViewport()
 
 void Editor2DViewport::OnPaint(Canvas* canvas)
 {
-	Colorf background(160 / 255.0f, 160 / 255.0f, 160 / 255.0f);
+	Colorf background = Colorf::fromRgba8(40, 40, 40);
 	canvas->fillRect(Rect::xywh(0.0, 0.0, GetWidth(), GetHeight()), background);
 	DrawGrid(canvas);
 	if (engine && engine->Level)
@@ -87,7 +87,7 @@ void Editor2DViewport::DrawNodeSurface(Canvas* canvas, BspNode* node)
 
 	BspVert* v = &model->Vertices[node->VertPool];
 
-	Colorf linecolor(80 / 255.0f, 80 / 255.0f, 220 / 255.0f);
+	Colorf linecolor = Colorf::fromRgba8(150, 150, 150);
 	Point center(GetWidth() * 0.5, GetHeight() * 0.5);
 
 	int numverts = node->NumVertices;
@@ -106,7 +106,7 @@ void Editor2DViewport::DrawNodeSurface(Canvas* canvas, BspNode* node)
 
 void Editor2DViewport::DrawGrid(Canvas* canvas)
 {
-	Colorf linecolor(128 / 255.0f, 128 / 255.0f, 128 / 255.0f);
+	Colorf linecolor = Colorf::fromRgba8(75, 75, 75);
 	Point center(GetWidth() * 0.5, GetHeight() * 0.5);
 
 	for (double y = -32767.0; y < 32767.0; y += 1000.0)

diff --git a/SurrealEngine/UI/Editor/Editor3DViewport.cpp b/SurrealEngine/UI/Editor/Editor3DViewport.cpp
@@ -16,7 +16,7 @@ Editor3DViewport::~Editor3DViewport()
 
 void Editor3DViewport::OnPaint(Canvas* canvas)
 {
-	canvas->fillRect(Rect::xywh(0.0, 0.0, GetWidth(), GetHeight()), Colorf(40 / 255.0f, 40 / 255.0f, 40 / 255.0f));
+	canvas->fillRect(Rect::xywh(0.0, 0.0, GetWidth(), GetHeight()), Colorf::fromRgba8(0, 0, 0));
 
 	if (!engine)
 		return;

diff --git a/SurrealEngine/UI/Editor/EditorViewportFrame.cpp b/SurrealEngine/UI/Editor/EditorViewportFrame.cpp
@@ -64,7 +64,7 @@ void EditorViewportFrame::Set3DMode()
 
 void EditorViewportFrame::OnPaint(Canvas* canvas)
 {
-	Colorf bordercolor(200 / 255.0f, 200 / 255.0f, 200 / 255.0f);
+	Colorf bordercolor(80 / 255.0f, 80 / 255.0f, 80 / 255.0f);
 	double headerHeight = 24.0;
 
 	double w = GetWidth();

diff --git a/SurrealEngine/UI/Editor/EditorViewportHeader.cpp b/SurrealEngine/UI/Editor/EditorViewportHeader.cpp
@@ -19,5 +19,5 @@ void EditorViewportHeader::SetTitle(const std::string& title)
 
 void EditorViewportHeader::OnPaint(Canvas* canvas)
 {
-	canvas->drawText({ 7.0, 17.0 }, Colorf(0.0f, 0.0f, 0.0f), Title);
+	canvas->drawText({ 7.0, 17.0 }, Colorf::fromRgba8(226, 223, 219), Title);
 }
diff --git a/Thirdparty/ZWidget/src/core/theme.cpp b/Thirdparty/ZWidget/src/core/theme.cpp
@@ -236,7 +236,7 @@ DarkWidgetTheme::DarkWidgetTheme()
 	checkbox_label->SetColor("unchecked-outer-border-color", Colorf::fromRgba8(99, 99, 99));
 	checkbox_label->SetColor("unchecked-inner-border-color", Colorf::fromRgba8(51, 51, 51));
 
-	menubar->SetColor("background-color", Colorf::fromRgba8(70, 70, 70));
+	menubar->SetColor("background-color", Colorf::fromRgba8(33, 33, 33));
 
 	menubaritem->SetColor("color", Colorf::fromRgba8(226, 223, 219));
 	menubaritem->SetColor("hover", "background-color", Colorf::fromRgba8(78, 78, 78));

diff --git a/Thirdparty/ZWidget/src/widgets/menubar/menubar.cpp b/Thirdparty/ZWidget/src/widgets/menubar/menubar.cpp
@@ -386,5 +386,5 @@ MenuItemSeparator::MenuItemSeparator(Widget* parent) : Widget(parent)
 
 void MenuItemSeparator::OnPaint(Canvas* canvas)
 {
-	canvas->fillRect(Rect::xywh(0.0, GridFitPoint(GetHeight() * 0.5), GetWidth(), GridFitSize(1.0)), Colorf::fromRgba8(200, 200, 200));
+	canvas->fillRect(Rect::xywh(0.0, GridFitPoint(GetHeight() * 0.5), GetWidth(), GridFitSize(1.0)), Colorf::fromRgba8(75, 75, 75));
 }
diff --git a/Thirdparty/ZWidget/src/widgets/statusbar/statusbar.cpp b/Thirdparty/ZWidget/src/widgets/statusbar/statusbar.cpp
@@ -15,5 +15,5 @@ Statusbar::~Statusbar()
 
 void Statusbar::OnPaint(Canvas* canvas)
 {
-	canvas->drawText(Point(16.0, 21.0), Colorf::fromRgba8(0, 0, 0), "Command:");
+	canvas->drawText(Point(16.0, 21.0), Colorf::fromRgba8(226, 223, 219), "Command:");
 }