diff --git a/ImageShader.cpp b/ImageShader.cpp index faffe32..782a5d7 100644 --- a/ImageShader.cpp +++ b/ImageShader.cpp @@ -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_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 program_ = &imageShadingProgram; diff --git a/TextureView.cpp b/TextureView.cpp index 2131bfc..331c3da 100644 --- a/TextureView.cpp +++ b/TextureView.cpp @@ -840,7 +840,7 @@ void TextureView::draw() // disabled info else { ImGui::SameLine(0, 60); - ImGui::TextDisabled( MaskShader::mask_shapes[shape] ); + ImGui::TextDisabled( "%s", MaskShader::mask_shapes[shape] ); ImGui::SameLine(); ImGui::TextDisabled( "mask"); } diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp index 078265b..c948854 100644 --- a/UserInterfaceManager.cpp +++ b/UserInterfaceManager.cpp @@ -475,7 +475,7 @@ void UserInterface::handleMouse() } // if not on any window - if ( !ImGui::IsAnyWindowHovered() && !ImGui::IsAnyWindowFocused() ) + if ( !ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow) && !ImGui::IsWindowFocused(ImGuiHoveredFlags_AnyWindow) ) { // // Mouse wheel over background