From d43a60fd8f4f6610f43e6f00885c4b3e7b0ed7aa Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Tue, 4 Jul 2023 15:03:34 +0800 Subject: [PATCH] FIX: [STUDIO-3542] button hover test in imagegrid Change-Id: Iabdab68d46d2cd7a883bb805e31641dd0b753d6a --- src/slic3r/GUI/ImageGrid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp index 65fc04e52..ed34579d9 100644 --- a/src/slic3r/GUI/ImageGrid.cpp +++ b/src/slic3r/GUI/ImageGrid.cpp @@ -257,12 +257,12 @@ std::pair Slic3r::GUI::ImageGrid::HitTest(wxPoint const &pt) if (index >= m_file_sys->GetCount()) { return {HIT_NONE, -1}; } if (!m_content_rect.Contains(off)) { return {HIT_NONE, -1}; } if (!m_selecting) { - wxRect hover_rect{0, m_content_rect.GetHeight() - 40, m_content_rect.GetWidth(), 40}; + wxRect hover_rect{0, m_content_rect.GetHeight() - m_buttons_background.GetHeight(), m_content_rect.GetWidth(), m_buttons_background.GetHeight()}; auto & file = m_file_sys->GetFile(index); int btn = file.IsDownload() && file.DownloadProgress() >= 0 ? 3 : 2; if (m_file_sys->GetFileType() == PrinterFileSystem::F_MODEL) { btn = 3; - hover_rect.y -= 64; + hover_rect.y -= m_content_rect.GetHeight() * 64 / 264; } if (hover_rect.Contains(off.x, off.y)) { return {HIT_ACTION, index * 4 + off.x * btn / hover_rect.GetWidth()}; } // Two buttons }