don't show size grip if the window the status bar is attached to is maximized or not resizeable at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
72cb72bf82
commit
7422d7c442
@ -78,6 +78,11 @@ public:
|
||||
// Responds to colour changes
|
||||
void OnSysColourChanged(wxSysColourChangedEvent& event);
|
||||
|
||||
// true if the status bar shows the size grip: for this it must have
|
||||
// wxST_SIZEGRIP style and the window it is attached to must be resizeable
|
||||
// and not maximized
|
||||
bool ShowsSizeGrip() const;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
@ -189,13 +189,23 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
|
||||
wxStatusBarBase::SetStatusWidths(n, widths_field);
|
||||
}
|
||||
|
||||
bool wxStatusBarGeneric::ShowsSizeGrip() const
|
||||
{
|
||||
if ( !HasFlag(wxST_SIZEGRIP) )
|
||||
return false;
|
||||
|
||||
wxTopLevelWindow * const
|
||||
tlw = wxDynamicCast(wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
|
||||
return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER);
|
||||
}
|
||||
|
||||
void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
|
||||
{
|
||||
wxPaintDC dc(this);
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
// Draw grip first
|
||||
if (HasFlag( wxST_SIZEGRIP ))
|
||||
if ( ShowsSizeGrip() )
|
||||
{
|
||||
int width, height;
|
||||
GetClientSize(&width, &height);
|
||||
@ -223,7 +233,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
|
||||
width-height-2, 2, height-2, height-4 );
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif // __WXGTK20__
|
||||
|
||||
if (GetFont().Ok())
|
||||
dc.SetFont(GetFont());
|
||||
@ -415,7 +425,7 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
|
||||
int width, height;
|
||||
GetClientSize(&width, &height);
|
||||
|
||||
if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
|
||||
if ( ShowsSizeGrip() && (event.GetX() > width-height) )
|
||||
{
|
||||
GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
|
||||
|
||||
@ -462,7 +472,7 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
|
||||
int width, height;
|
||||
GetClientSize(&width, &height);
|
||||
|
||||
if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
|
||||
if ( ShowsSizeGrip() && (event.GetX() > width-height) )
|
||||
{
|
||||
GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user