Only account for WM frame extents in tlw size if WM supports _NET_FRAME_EXTENTS. Extents cache no longer needed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,9 +14,6 @@
|
||||
|
||||
#if wxUSE_TASKBARICON
|
||||
|
||||
#include <gtk/gtkversion.h>
|
||||
#if GTK_CHECK_VERSION(2, 1, 0)
|
||||
|
||||
#include "wx/gtk/taskbarpriv.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
@@ -47,6 +44,16 @@ wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()
|
||||
wxFRAME_SHAPED,
|
||||
wxEmptyString /*eggtray doesn't like setting wmclass*/);
|
||||
|
||||
// WM frame extents are not useful for wxTaskBarIcon
|
||||
m_deferShow = false;
|
||||
gulong handler_id = g_signal_handler_find(
|
||||
m_widget,
|
||||
GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
|
||||
g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
|
||||
0, NULL, NULL, this);
|
||||
if (handler_id != 0)
|
||||
g_signal_handler_disconnect(m_widget, handler_id);
|
||||
|
||||
m_invokingWindow = NULL;
|
||||
}
|
||||
|
||||
@@ -71,13 +78,6 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
|
||||
return (bool)s_supported;
|
||||
}
|
||||
|
||||
bool wxTaskBarIconAreaBase::IsDecorCacheable() const
|
||||
{
|
||||
// Apparently, WM frame extents extend to full width of screen when window
|
||||
// is in the tray. Don't cache, it's not useful for other windows.
|
||||
return false;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Pop-up menu stuff
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -150,5 +150,4 @@ bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
|
||||
}
|
||||
|
||||
#endif // wxUSE_MENUS_NATIVE
|
||||
#endif // GTK_CHECK_VERSION(2, 1, 0)
|
||||
#endif // wxUSE_TASKBARICON
|
||||
|
Reference in New Issue
Block a user