keep window size in single window mode even when no tab is opened. Fixes #7823

This commit is contained in:
Yann Leboulanger 2016-02-21 10:32:55 +01:00
parent 4a151d1370
commit a0d9d6cf2a
2 changed files with 9 additions and 1 deletions

View File

@ -64,6 +64,7 @@ from chat_control import ChatControlBase
from chat_control import ChatControl from chat_control import ChatControl
from groupchat_control import GroupchatControl from groupchat_control import GroupchatControl
from groupchat_control import PrivateChatControl from groupchat_control import PrivateChatControl
from message_window import MessageWindowMgr
from atom_window import AtomWindow from atom_window import AtomWindow
from session import ChatControlSession from session import ChatControlSession
@ -2710,6 +2711,10 @@ class Interface:
self.show_systray() self.show_systray()
self.roster = roster_window.RosterWindow() self.roster = roster_window.RosterWindow()
if self.msg_win_mgr.mode == \
MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
self.msg_win_mgr.create_window(None, None, None)
# Creating plugin manager # Creating plugin manager
import plugins import plugins
gajim.plugin_manager = plugins.PluginManager() gajim.plugin_manager = plugins.PluginManager()

View File

@ -601,7 +601,10 @@ class MessageWindow(object):
ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) ctrl.allow_shutdown(method, on_yes, on_no, on_minimize)
def check_tabs(self): def check_tabs(self):
if self.get_num_controls() == 0: if self.parent_paned:
# Do nothing in single window mode
pass
elif self.get_num_controls() == 0:
# These are not called when the window is destroyed like this, fake it # These are not called when the window is destroyed like this, fake it
gajim.interface.msg_win_mgr._on_window_delete(self.window, None) gajim.interface.msg_win_mgr._on_window_delete(self.window, None)
gajim.interface.msg_win_mgr._on_window_destroy(self.window) gajim.interface.msg_win_mgr._on_window_destroy(self.window)