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

Compilation warning fix

Browse Source
This commit is contained in:
Bruno Herbelin
2022-03-18 21:46:22 +01:00
parent f4b6db9404
commit 5582ee8ed8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ImageShader.cpp
View File

@@ -41,7 +41,7 @@ std::vector< ShadingProgram > maskPrograms = {
const char* MaskShader::mask_names[3] = { ICON_FA_EXPAND, ICON_FA_EDIT, ICON_FA_SHAPES }; const char* MaskShader::mask_names[3] = { ICON_FA_EXPAND, ICON_FA_EDIT, ICON_FA_SHAPES };
const char* MaskShader::mask_shapes[5] = { "Elipse", "Oblong", "Rectangle", "Horizontal", "Vertical" }; const char* MaskShader::mask_shapes[5] = { "Elipse", "Oblong", "Rectangle", "Horizontal", "Vertical" };
ImageShader::ImageShader(): Shader(), stipple(0.f), mask_texture(0) ImageShader::ImageShader(): Shader(), mask_texture(0), stipple(0.f)
{ {
// static program shader // static program shader
program_ = &imageShadingProgram; program_ = &imageShadingProgram;

2
TextureView.cpp
View File

@@ -840,7 +840,7 @@ void TextureView::draw()
// disabled info // disabled info
else { else {
ImGui::SameLine(0, 60); ImGui::SameLine(0, 60);
ImGui::TextDisabled( MaskShader::mask_shapes[shape] ); ImGui::TextDisabled( "%s", MaskShader::mask_shapes[shape] );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "mask"); ImGui::TextDisabled( "mask");
} }

2
UserInterfaceManager.cpp
View File

@@ -475,7 +475,7 @@ void UserInterface::handleMouse()
} }
// if not on any window // if not on any window
if ( !ImGui::IsAnyWindowHovered() && !ImGui::IsAnyWindowFocused() ) if ( !ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow) && !ImGui::IsWindowFocused(ImGuiHoveredFlags_AnyWindow) )
{ {
// //
// Mouse wheel over background // Mouse wheel over background