diff --git a/src/ImGuiToolkit.cpp b/src/ImGuiToolkit.cpp index cfa066c..e2fcc9f 100644 --- a/src/ImGuiToolkit.cpp +++ b/src/ImGuiToolkit.cpp @@ -1715,16 +1715,16 @@ void ImGuiToolkit::SetAccentColor(accent_color color) 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_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); - colors[ImGuiCol_PopupBg] = ImVec4(0.08f, 0.08f, 0.08f, 0.97f); + colors[ImGuiCol_PopupBg] = ImVec4(0.10f, 0.10f, 0.10f, 0.90f); colors[ImGuiCol_Border] = ImVec4(0.69f, 0.69f, 0.69f, 0.25f); colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); colors[ImGuiCol_FrameBg] = ImVec4(0.39f, 0.39f, 0.39f, 0.55f); colors[ImGuiCol_FrameBgHovered] = ImVec4(0.29f, 0.29f, 0.29f, 0.60f); colors[ImGuiCol_FrameBgActive] = ImVec4(0.22f, 0.22f, 0.22f, 0.80f); - colors[ImGuiCol_TitleBg] = ImVec4(0.14f, 0.14f, 0.14f, 0.94f); - colors[ImGuiCol_TitleBgActive] = ImVec4(0.26f, 0.26f, 0.26f, 1.00f); + colors[ImGuiCol_TitleBg] = ImVec4(0.26f, 0.26f, 0.26f, 0.94f); + colors[ImGuiCol_TitleBgActive] = ImVec4(0.27f, 0.27f, 0.27f, 1.00f); colors[ImGuiCol_TitleBgCollapsed] = ImVec4(0.00f, 0.00f, 0.00f, 0.51f); - colors[ImGuiCol_MenuBarBg] = ImVec4(0.36f, 0.36f, 0.36f, 0.62f); + colors[ImGuiCol_MenuBarBg] = ImVec4(0.30f, 0.30f, 0.30f, 0.64f); colors[ImGuiCol_ScrollbarBg] = ImVec4(0.02f, 0.02f, 0.02f, 0.53f); colors[ImGuiCol_ScrollbarGrab] = ImVec4(0.31f, 0.31f, 0.31f, 1.00f); colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.41f, 0.41f, 0.41f, 1.00f); @@ -1736,7 +1736,6 @@ void ImGuiToolkit::SetAccentColor(accent_color color) colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.13f); colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.10f, 0.10f, 0.10f, 0.60f); - if (color == ImGuiToolkit::ACCENT_ORANGE) { colors[ImGuiCol_CheckMark] = ImVec4(1.00f, 0.63f, 0.31f, 1.00f); diff --git a/src/ImGuiVisitor.cpp b/src/ImGuiVisitor.cpp index 44908d0..11a2650 100644 --- a/src/ImGuiVisitor.cpp +++ b/src/ImGuiVisitor.cpp @@ -541,7 +541,7 @@ void ImGuiVisitor::visit (Source& s) // menu icon for image processing ImGui::SameLine(preview_width, 2 * IMGUI_SAME_LINE); static uint counter_menu_timeout = 0; - if (ImGuiToolkit::IconButton(5, 8) || ImGui::IsItemHovered()) { + if (ImGuiToolkit::IconButton(5, 8) || ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup)) { counter_menu_timeout=0; ImGui::OpenPopup( "MenuImageProcessing" ); } @@ -605,7 +605,7 @@ void ImGuiVisitor::visit (Source& s) if (ImGui::IsWindowHovered()) counter_menu_timeout=0; - else if (++counter_menu_timeout > 60) + else if (++counter_menu_timeout > 10) ImGui::CloseCurrentPopup(); ImGui::EndPopup(); diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp index 5336279..645c7ba 100644 --- a/src/UserInterfaceManager.cpp +++ b/src/UserInterfaceManager.cpp @@ -2286,6 +2286,9 @@ void HelperToolbox::Render() ImGui::Text(ICON_FA_CHESS_BOARD " Texturing"); ImGui::NextColumn(); ImGui::Text ("Apply masks or freely paint the texture on the source surface. Repeat or crop the graphics."); ImGui::NextColumn(); + ImGui::Text(ICON_FA_TV " Displays"); ImGui::NextColumn(); + ImGui::Text ("Manage and place output windows in computer's displays (e.g. fullscreen mode, color white balance adjustment)."); + ImGui::NextColumn(); ImGui::Columns(1); ImGui::PopTextWrapPos(); @@ -2309,11 +2312,14 @@ void HelperToolbox::Render() ImGui::Text(ICON_FA_HAND_PAPER " Inputs"); ImGui::NextColumn(); ImGui::Text ("Define how user inputs (e.g. keyboard, joystick) are mapped to custom actions in the session."); ImGui::NextColumn(); - ImGui::Text(ICON_FA_STICKY_NOTE " Notes"); ImGui::NextColumn(); - ImGui::Text ("Place sticky notes into your session. Does nothing, just keep notes and reminders."); + ImGui::Text(ICON_FA_VECTOR_SQUARE " Source editor"); ImGui::NextColumn(); + ImGui::Text ("Toolbar to show and edit alpha and geometry of the current source."); ImGui::NextColumn(); ImGui::Text(ICON_FA_TACHOMETER_ALT " Metrics"); ImGui::NextColumn(); - ImGui::Text ("Utility monitoring of metrics on the system (FPS, RAM), the runtime (session duration), or the current source."); + ImGui::Text ("Monitoring of metrics on the system (e.g. FPS, RAM) and runtime (e.g. session duration)."); + ImGui::NextColumn(); + ImGui::Text(ICON_FA_STICKY_NOTE " Sticky note"); ImGui::NextColumn(); + ImGui::Text ("Place sticky notes into your session. Does nothing, just keep notes and reminders."); ImGui::NextColumn(); ImGui::Text(ICON_FA_COG " Settings"); ImGui::NextColumn(); ImGui::Text ("Set user preferences and system settings."); @@ -8889,7 +8895,7 @@ void Navigator::RenderMainPannelVimix() ImGui::SameLine(0, ImGui::GetTextLineHeight()); static uint counter_menu_timeout = 0; - if ( ImGuiToolkit::IconButton( ICON_FA_ELLIPSIS_V ) || ImGui::IsItemHovered() ) { + if ( ImGuiToolkit::IconButton( ICON_FA_ELLIPSIS_V ) || ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup) ) { counter_menu_timeout=0; ImGui::OpenPopup( "MenuToolboxWindows" ); } @@ -8911,7 +8917,7 @@ void Navigator::RenderMainPannelVimix() // timer to close menu like a tooltip if (ImGui::IsWindowHovered()) counter_menu_timeout=0; - else if (++counter_menu_timeout > 60) + else if (++counter_menu_timeout > 10) ImGui::CloseCurrentPopup(); ImGui::EndPopup();