eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup icons and minor bugfix UI

Browse Source
This commit is contained in:
Bruno Herbelin
2022-01-05 01:02:44 +01:00
parent ad8d799cf6
commit d402143989
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TextureView.cpp
View File

@@ -611,7 +611,7 @@ void TextureView::draw()
ICON_FA_MOUSE_POINTER "\t Edit texture\n" ICON_FA_MOUSE_POINTER "\t Edit texture\n"
ICON_FA_PAINT_BRUSH "\tBrush\n" ICON_FA_PAINT_BRUSH "\tBrush\n"
ICON_FA_ERASER "\tEraser\n\n" ICON_FA_ERASER "\tEraser\n\n"
ICON_FA_ARROW_DOWN "\tBrush shape\n" ICON_FA_CIRCLE "\tBrush shape\n"
ICON_FA_DOT_CIRCLE "\tBrush size\n" ICON_FA_DOT_CIRCLE "\tBrush size\n"
ICON_FA_FEATHER_ALT "\tBrush Pressure\n\n" ICON_FA_FEATHER_ALT "\tBrush Pressure\n\n"
ICON_FA_MAGIC "\tEffects\n" ICON_FA_MAGIC "\tEffects\n"
@@ -768,7 +768,7 @@ void TextureView::draw()
ImGuiToolkit::HelpToolTip( ICON_FA_SHAPES "\tMask shape\n\n" ImGuiToolkit::HelpToolTip( ICON_FA_SHAPES "\tMask shape\n\n"
ICON_FA_MOUSE_POINTER "\t Edit texture\n" ICON_FA_MOUSE_POINTER "\t Edit texture\n"
ICON_FA_CROP_ALT "\tCrop & Edit shape\n\n" ICON_FA_CROP_ALT "\tCrop & Edit shape\n\n"
ICON_FA_ARROW_DOWN "\tShape of the mask\n" ICON_FA_CARET_DOWN " \tShape of the mask\n"
ICON_FA_RADIATION_ALT "\tShape blur"); ICON_FA_RADIATION_ALT "\tShape blur");
// select cursor // select cursor

14
UserInterfaceManager.cpp
View File

@@ -298,20 +298,14 @@ void UserInterface::handleKeyboard()
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_D )) { else if (ImGui::IsKeyPressed( GLFW_KEY_D )) {
// Display output // Display output
Settings::application.widget.preview = !Settings::application.widget.preview; bool on = !Settings::application.widget.preview;
if (Settings::application.widget.preview_view != Settings::application.current_view) { if (on && Settings::application.widget.preview_view != Settings::application.current_view)
Settings::application.widget.preview_view = -1; Settings::application.widget.preview_view = -1;
Settings::application.widget.preview = true; Settings::application.widget.preview = on;
}
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_P )) { else if (ImGui::IsKeyPressed( GLFW_KEY_P )) {
// Media player // Media player
sourcecontrol.setVisible(!Settings::application.widget.media_player); sourcecontrol.setVisible(!Settings::application.widget.media_player);
// Settings::application.widget.media_player = !Settings::application.widget.media_player;
// if (Settings::application.widget.media_player_view != Settings::application.current_view) {
// Settings::application.widget.media_player_view = -1;
// Settings::application.widget.media_player = true;
// }
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_A )) { else if (ImGui::IsKeyPressed( GLFW_KEY_A )) {
if (shift_modifier_active) if (shift_modifier_active)
@@ -3260,7 +3254,7 @@ bool SourceController::SourceButton(Source *s, ImVec2 framesize)
draw_list->AddRect(frame_top, frame_top + framesize - ImVec2(1.f, 0.f), ImGui::GetColorU32(ImGuiCol_Text), 0, 0, 3.f); draw_list->AddRect(frame_top, frame_top + framesize - ImVec2(1.f, 0.f), ImGui::GetColorU32(ImGuiCol_Text), 0, 0, 3.f);
frame_top.x += (framesize.x - ImGui::GetTextLineHeight()) / 2.f; frame_top.x += (framesize.x - ImGui::GetTextLineHeight()) / 2.f;
frame_top.y += (framesize.y - ImGui::GetTextLineHeight()) / 2.f; frame_top.y += (framesize.y - ImGui::GetTextLineHeight()) / 2.f;
draw_list->AddText(frame_top, ImGui::GetColorU32(ImGuiCol_Text), ICON_FA_ARROW_RIGHT); draw_list->AddText(frame_top, ImGui::GetColorU32(ImGuiCol_Text), ICON_FA_CARET_SQUARE_RIGHT);
} }
ImGui::PopID(); ImGui::PopID();