Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wxComboCtrlBase::ShowPopup() to show a popup control in respect to the display of the provided window instead of primary display. See issue The "Show" Dropdown list goes out of the screen #2999 (https://github.com/prusa3d/prusaslicer/issues/2999)

Browse Source
This commit is contained in:
YuSanka
2021-02-12 17:26:36 +01:00
committed by Maarten Bent
parent 36ab71301c
commit 76354fbc8d
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/combocmn.cpp
View File

@@ -20,6 +20,7 @@
#include "wx/combo.h" #include "wx/combo.h"
#include "wx/display.h"
#ifdef __WXMSW__ #ifdef __WXMSW__
#include "wx/msw/private.h" #include "wx/msw/private.h"
@@ -2284,6 +2285,9 @@ void wxComboCtrlBase::ShowPopup()
SetFocus(); SetFocus();
int displayIdx = wxDisplay::GetFromWindow(this);
wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
// Space above and below // Space above and below
int screenHeight; int screenHeight;
wxPoint scrPos; wxPoint scrPos;
@@ -2292,8 +2296,11 @@ void wxComboCtrlBase::ShowPopup()
int maxHeightPopup; int maxHeightPopup;
wxSize ctrlSz = GetSize(); wxSize ctrlSz = GetSize();
screenHeight = wxSystemSettings::GetMetric( wxSYS_SCREEN_Y, this ); // wxSystemSettings::GetMetric( wxSYS_SCREEN_Y, this ) returns a geometry of the primary display
scrPos = GetScreenPosition(); // And it causes wrong calculation of the popuping on secondary monitor.
// So, let's make all calculation in respect to the display of the provided window.
screenHeight = displayRect.height;//wxSystemSettings::GetMetric( wxSYS_SCREEN_Y, this );
scrPos = GetScreenPosition() - displayRect.GetTopLeft();
spaceAbove = scrPos.y; spaceAbove = scrPos.y;
spaceBelow = screenHeight - spaceAbove - ctrlSz.y; spaceBelow = screenHeight - spaceAbove - ctrlSz.y;
@@ -2357,20 +2364,20 @@ void wxComboCtrlBase::ShowPopup()
wxSize szp = popup->GetSize(); wxSize szp = popup->GetSize();
int popupX; int popupX;
int popupY = scrPos.y + ctrlSz.y; int popupY = scrPos.y + ctrlSz.y + displayRect.GetTop();
// Default anchor is wxLEFT // Default anchor is wxLEFT
int anchorSide = m_anchorSide; int anchorSide = m_anchorSide;
if ( !anchorSide ) if ( !anchorSide )
anchorSide = wxLEFT; anchorSide = wxLEFT;
int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x; int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x + displayRect.GetLeft();
int leftX = scrPos.x - m_extLeft; int leftX = scrPos.x - m_extLeft + displayRect.GetLeft();
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
leftX -= ctrlSz.x; leftX -= ctrlSz.x;
int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X, this ); int screenWidth = displayRect.width;// wxSystemSettings::GetMetric( wxSYS_SCREEN_X, this );
// If there is not enough horizontal space, anchor on the other side. // If there is not enough horizontal space, anchor on the other side.
// If there is no space even then, place the popup at x 0. // If there is no space even then, place the popup at x 0.
@@ -2407,7 +2414,7 @@ void wxComboCtrlBase::ShowPopup()
if ( spaceBelow < szp.y ) if ( spaceBelow < szp.y )
{ {
popupY = scrPos.y - szp.y; popupY = scrPos.y - szp.y + displayRect.GetTop();
showFlags |= ShowAbove; showFlags |= ShowAbove;
} }