diff --git a/src/ImGuiToolkit.cpp b/src/ImGuiToolkit.cpp index e2fcc9f..0a6d778 100644 --- a/src/ImGuiToolkit.cpp +++ b/src/ImGuiToolkit.cpp @@ -1437,7 +1437,7 @@ bool ImGuiToolkit::EditPlotHistoLines (const char* label, float *histogram_array // plot histogram (with frame) ImGui::PushStyleColor(ImGuiCol_FrameBg, bg_color); - ImGui::PushStyleColor(ImGuiCol_PlotHistogram, style.Colors[ImGuiCol_TitleBg]); // a dark color + ImGui::PushStyleColor(ImGuiCol_PlotHistogram, style.Colors[ImGuiCol_ModalWindowDimBg]); // a dark color char buf[128]; sprintf(buf, "##Histo%s", label); ImGui::PlotHistogram(buf, histogram_array, values_count, 0, NULL, values_min, values_max, size); @@ -1713,7 +1713,7 @@ void ImGuiToolkit::SetAccentColor(accent_color color) colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); colors[ImGuiCol_TextDisabled] = ImVec4(0.55f, 0.55f, 0.55f, 1.00f); - colors[ImGuiCol_WindowBg] = ImVec4(0.13f, 0.13f, 0.14f, 0.94f); + colors[ImGuiCol_WindowBg] = ImVec4(0.13f, 0.13f, 0.13f, 0.94f); colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); colors[ImGuiCol_PopupBg] = ImVec4(0.10f, 0.10f, 0.10f, 0.90f); colors[ImGuiCol_Border] = ImVec4(0.69f, 0.69f, 0.69f, 0.25f); @@ -1730,8 +1730,8 @@ void ImGuiToolkit::SetAccentColor(accent_color color) colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.41f, 0.41f, 0.41f, 1.00f); colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.51f, 0.51f, 0.51f, 1.00f); colors[ImGuiCol_Button] = ImVec4(0.47f, 0.47f, 0.47f, 0.72f); - colors[ImGuiCol_ButtonHovered] = ImVec4(0.24f, 0.24f, 0.24f, 0.90f); - colors[ImGuiCol_ButtonActive] = ImVec4(0.24f, 0.24f, 0.24f, 0.67f); + colors[ImGuiCol_ButtonHovered] = ImVec4(0.29f, 0.29f, 0.29f, 0.72f); + colors[ImGuiCol_ButtonActive] = ImVec4(0.24f, 0.24f, 0.24f, 0.78f); colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.60f); colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.13f); colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.10f, 0.10f, 0.10f, 0.60f); diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp index 645c7ba..2386810 100644 --- a/src/UserInterfaceManager.cpp +++ b/src/UserInterfaceManager.cpp @@ -1919,6 +1919,13 @@ void UserInterface::RenderAbout(bool* p_open) ImGui::Text("\nvimix is licensed under GNU GPL version 3 or later.\n" UNICODE_COPYRIGHT " 2019-2023 Bruno Herbelin."); ImGui::Spacing(); + + if ( ImGui::Button(MENU_HELP, ImVec2(250.f, 0.f)) ) + Settings::application.widget.help = true; + ImGui::SameLine(0, 12); + if ( ImGui::Button(MENU_LOGS, ImVec2(250.f, 0.f)) ) + Settings::application.widget.logs = true; + ImGuiToolkit::ButtonOpenUrl("Visit vimix website", "https://brunoherbelin.github.io/vimix/", ImVec2(ImGui::GetContentRegionAvail().x, 0)); ImGui::Spacing(); @@ -8914,6 +8921,9 @@ void Navigator::RenderMainPannelVimix() // Show help if (ImGui::MenuItem( MENU_HELP, SHORTCUT_HELP) ) Settings::application.widget.help = true; + // Show Logs + if (ImGui::MenuItem( MENU_LOGS, SHORTCUT_LOGS) ) + Settings::application.widget.logs = true; // timer to close menu like a tooltip if (ImGui::IsWindowHovered()) counter_menu_timeout=0; diff --git a/src/UserInterfaceManager.h b/src/UserInterfaceManager.h index e89f143..950a68b 100644 --- a/src/UserInterfaceManager.h +++ b/src/UserInterfaceManager.h @@ -44,7 +44,6 @@ #define MENU_SAVE_ON_EXIT ICON_FA_LEVEL_DOWN_ALT " Save on exit" #define MENU_OPEN_ON_START ICON_FA_LEVEL_UP_ALT " Restore on start" #define SHORTCUT_SAVEAS_FILE CTRL_MOD "Shift+S" -#define SHORTCUT_LOGS CTRL_MOD "L" #define MENU_QUIT ICON_FA_POWER_OFF " Quit" #define SHORTCUT_QUIT CTRL_MOD "Q" #define MENU_CUT ICON_FA_CUT " Cut" @@ -81,6 +80,8 @@ #define MENU_SOURCE_TOOL ICON_FA_VECTOR_SQUARE " Source editor" #define MENU_HELP ICON_FA_LIFE_RING " Help" #define SHORTCUT_HELP CTRL_MOD "H" +#define MENU_LOGS ICON_FA_LIST_UL " Logs" +#define SHORTCUT_LOGS CTRL_MOD "L" #define TOOLTIP_PLAYER "Player " #define SHORTCUT_PLAYER CTRL_MOD "P" #define TOOLTIP_OUTPUT "Display "