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

Record wxSTCPopupWindow position every time its set

Browse Source 
The position of wxSTCPopupWindow is currently recorded the first time it
is set so that it can be used to reposition the popup when its parent
window is moved. However Scintilla apparently positions the popup at
least twice when icons are used and the first set position is slightly
wrong. Instead just record the position every time its set by Scintilla.
This commit is contained in:
New Pagodi 2019-08-06 18:19:58 -05:00
parent b2d1343fbc
commit 075fa2b764
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/stc/PlatWX.cpp
View File

@ -2224,7 +2224,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
#endif // __WXOSX_COCOA__
wxSTCPopupWindow::wxSTCPopupWindow(wxWindow* parent)
:wxSTCPopupBase(parent), m_initialPosition(wxDefaultPosition)
:wxSTCPopupBase(parent), m_lastKnownPosition(wxDefaultPosition)
{
#if !wxSTC_POPUP_IS_CUSTOM
Bind(wxEVT_SET_FOCUS, &wxSTCPopupWindow::OnFocus, this);
@ -2275,9 +2275,7 @@ bool wxSTCPopupWindow::AcceptsFocus() const
void wxSTCPopupWindow::DoSetSize(int x, int y, int width, int height, int flags)
{
if ( m_initialPosition == wxDefaultPosition
&& x != wxDefaultCoord && y != wxDefaultCoord )
m_initialPosition = wxPoint(x, y);
m_lastKnownPosition = wxPoint(x, y);
// convert coords to screen coords since we're a top-level window
if (x != wxDefaultCoord)
@ -2291,8 +2289,8 @@ void wxSTCPopupWindow::DoSetSize(int x, int y, int width, int height, int flags)
void wxSTCPopupWindow::OnParentMove(wxMoveEvent& event)
{
if ( m_initialPosition != wxDefaultPosition )
SetPosition(m_initialPosition);
if ( m_lastKnownPosition.IsFullySpecified() )
SetPosition(m_lastKnownPosition);
event.Skip();
}

2
src/stc/PlatWX.h
View File

@ -150,7 +150,7 @@ protected:
#endif
private:
wxPoint m_initialPosition;
wxPoint m_lastKnownPosition;
wxWindow* m_tlw;
};