From 24f0beac34bf1787233ca91c9eb9be7a06410f67 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 26 Nov 2010 15:46:28 +0200 Subject: [PATCH] Fix for maximized case of stats window --- gui/builtinContextMenus/itemStats.py | 8 +++++++- gui/itemStats.py | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gui/builtinContextMenus/itemStats.py b/gui/builtinContextMenus/itemStats.py index dfcbb0819..f42b09c53 100644 --- a/gui/builtinContextMenus/itemStats.py +++ b/gui/builtinContextMenus/itemStats.py @@ -44,7 +44,13 @@ class ItemStats(ContextMenu): elif reuse: lastWnd = self.mainFrame.GetActiveStatsWindow() pos = lastWnd.GetPosition() - dlg=ItemStatsDialog(stuff, context.capitalize() if context not in self.REPLACES else self.REPLACES[context], pos) + maximized = lastWnd.IsMaximized() + if not maximized: + size = lastWnd.GetSize() + else: + size = wx.DefaultSize + pos = wx.DefaultPosition + dlg=ItemStatsDialog(stuff, context.capitalize() if context not in self.REPLACES else self.REPLACES[context], pos, size, maximized) lastWnd.closeEvent(None) else: diff --git a/gui/itemStats.py b/gui/itemStats.py index 45e75eaa3..6890c9079 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -30,10 +30,10 @@ import service class ItemStatsDialog(wx.Dialog): counter = 0 - def __init__(self, victim, context = None, pos = wx.DefaultPosition): + def __init__(self, victim, context = None, pos = wx.DefaultPosition, size = wx.DefaultSize, maximized = False): wx.Dialog.__init__(self, gui.mainFrame.MainFrame.getInstance(), - wx.ID_ANY, title="Item stats", pos = pos, + wx.ID_ANY, title="Item stats", pos = pos, size = size, style = wx.CAPTION | wx.CLOSE_BOX | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER| wx.SYSTEM_MENU) @@ -86,6 +86,11 @@ class ItemStatsDialog(wx.Dialog): self.SetPosition((dlgx,dlgy)) else: self.SetPosition(pos) + if maximized: + self.Maximize(True) + else: + if size != wx.DefaultSize: + self.SetSize(size) self.parentWnd.RegisterStatsWindow(self) self.Show()