redstrate/prism
Archived
1
Fork 0
Code Activity

Add detection for light/dark theme

Browse source
This commit is contained in:
redstrate 2020-09-22 12:27:41 -04:00
parent 827ce8bec6
commit 807cf7ba86
3 changed files with 64 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
engine/core/include/platform.hpp
View file

@ -58,10 +58,19 @@ enum class PlatformFeature {
Windowing Windowing
}; };
/// On platforms that has a GUI with a seperate light/dark mode.
enum class PlatformTheme {
Light,
Dark
};
namespace platform { namespace platform {
/// Returns a human readable platform name, e.g. Linux. /// Returns a human readable platform name, e.g. Linux.
const char* get_name(); const char* get_name();
/// Returns the current platform theme.
PlatformTheme get_theme();
/// Queries whether or not the platform supports a certain feature. /// Queries whether or not the platform supports a certain feature.
bool supports_feature(const PlatformFeature feature); bool supports_feature(const PlatformFeature feature);

72
engine/core/src/imguilayer.cpp
View file

@ -47,39 +47,49 @@ ImGuiLayer::ImGuiLayer() {
for (auto& [im, pl] : imToPl) for (auto& [im, pl] : imToPl)
io.KeyMap[im] = platform::get_keycode(pl); io.KeyMap[im] = platform::get_keycode(pl);
ImGui::StyleColorsDark(); const auto theme = platform::get_theme();
switch(theme) {
case PlatformTheme::Light:
ImGui::StyleColorsLight();
break;
case PlatformTheme::Dark:
{
ImGui::StyleColorsDark();
auto& style = ImGui::GetStyle(); auto& style = ImGui::GetStyle();
style.FrameRounding = 3; style.FrameRounding = 3;
style.FrameBorderSize = 0.0f; style.FrameBorderSize = 0.0f;
style.WindowBorderSize = 0.0f; style.WindowBorderSize = 0.0f;
style.WindowPadding = ImVec2(10, 10); style.WindowPadding = ImVec2(10, 10);
style.FramePadding = ImVec2(4, 4); style.FramePadding = ImVec2(4, 4);
style.ItemInnerSpacing = ImVec2(5, 0); style.ItemInnerSpacing = ImVec2(5, 0);
style.ItemSpacing = ImVec2(10, 5); style.ItemSpacing = ImVec2(10, 5);
style.ScrollbarSize = 10; style.ScrollbarSize = 10;
style.GrabMinSize = 6; style.GrabMinSize = 6;
style.WindowRounding = 3.0f; style.WindowRounding = 3.0f;
style.ChildRounding = 3.0f; style.ChildRounding = 3.0f;
style.PopupRounding = 3.0f; style.PopupRounding = 3.0f;
style.ScrollbarRounding = 12.0f; style.ScrollbarRounding = 12.0f;
style.GrabRounding = 3.0f; style.GrabRounding = 3.0f;
style.TabRounding = 3.0f; style.TabRounding = 3.0f;
style.WindowTitleAlign = ImVec2(0.0, 0.5); style.WindowTitleAlign = ImVec2(0.0, 0.5);
ImVec4* colors = ImGui::GetStyle().Colors; ImVec4* colors = ImGui::GetStyle().Colors;
colors[ImGuiCol_FrameBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.54f); colors[ImGuiCol_FrameBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.54f);
colors[ImGuiCol_FrameBgHovered] = ImVec4(0.68f, 0.68f, 0.68f, 0.40f); colors[ImGuiCol_FrameBgHovered] = ImVec4(0.68f, 0.68f, 0.68f, 0.40f);
colors[ImGuiCol_FrameBgActive] = ImVec4(0.42f, 0.47f, 0.52f, 0.67f); colors[ImGuiCol_FrameBgActive] = ImVec4(0.42f, 0.47f, 0.52f, 0.67f);
colors[ImGuiCol_TitleBgActive] = ImVec4(0.23f, 0.43f, 0.73f, 1.00f); colors[ImGuiCol_TitleBgActive] = ImVec4(0.23f, 0.43f, 0.73f, 1.00f);
colors[ImGuiCol_CheckMark] = ImVec4(0.74f, 0.80f, 0.87f, 1.00f); colors[ImGuiCol_CheckMark] = ImVec4(0.74f, 0.80f, 0.87f, 1.00f);
colors[ImGuiCol_SliderGrab] = ImVec4(0.46f, 0.54f, 0.64f, 1.00f); colors[ImGuiCol_SliderGrab] = ImVec4(0.46f, 0.54f, 0.64f, 1.00f);
colors[ImGuiCol_Button] = ImVec4(0.38f, 0.51f, 0.65f, 0.40f); colors[ImGuiCol_Button] = ImVec4(0.38f, 0.51f, 0.65f, 0.40f);
colors[ImGuiCol_ButtonHovered] = ImVec4(0.57f, 0.61f, 0.67f, 1.00f); colors[ImGuiCol_ButtonHovered] = ImVec4(0.57f, 0.61f, 0.67f, 1.00f);
colors[ImGuiCol_ButtonActive] = ImVec4(0.32f, 0.34f, 0.36f, 1.00f); colors[ImGuiCol_ButtonActive] = ImVec4(0.32f, 0.34f, 0.36f, 1.00f);
colors[ImGuiCol_Tab] = ImVec4(0.22f, 0.27f, 0.33f, 0.86f); colors[ImGuiCol_Tab] = ImVec4(0.22f, 0.27f, 0.33f, 0.86f);
colors[ImGuiCol_TabActive] = ImVec4(0.33f, 0.51f, 0.75f, 1.00f); colors[ImGuiCol_TabActive] = ImVec4(0.33f, 0.51f, 0.75f, 1.00f);
colors[ImGuiCol_TabUnfocusedActive] = ImVec4(0.30f, 0.33f, 0.38f, 1.00f); colors[ImGuiCol_TabUnfocusedActive] = ImVec4(0.30f, 0.33f, 0.38f, 1.00f);
}
break;
}
ImGuiViewport* main_viewport = ImGui::GetMainViewport(); ImGuiViewport* main_viewport = ImGui::GetMainViewport();
main_viewport->PlatformHandle = new int(0); main_viewport->PlatformHandle = new int(0);

11
platforms/mac/main.mm.in
View file

@ -392,6 +392,17 @@ void platform::set_window_title(const int index, const std::string_view title) {
void platform::mute_output() {} void platform::mute_output() {}
void platform::unmute_output() {} void platform::unmute_output() {}
PlatformTheme platform::get_theme() {
auto str = [[[NSApplication sharedApplication] effectiveAppearance] name];
if(str == NSAppearanceNameAqua)
return PlatformTheme::Light;
else if(str == NSAppearanceNameDarkAqua)
return PlatformTheme::Dark;
return PlatformTheme::Light;
}
int platform::open_window(const std::string_view title, const prism::Rectangle rect, const WindowFlags flags) { int platform::open_window(const std::string_view title, const prism::Rectangle rect, const WindowFlags flags) {
NativeWindow* native = new NativeWindow(); NativeWindow* native = new NativeWindow();
native->index = windows.size(); native->index = windows.size();