diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 93b51e114..019f159ff 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -1195,7 +1195,7 @@ class AllTorrents(BaseMode, component.Component): elif chr(c) == 'f': self._show_torrent_filter_popup() elif chr(c) == 'h': - self.popup = Popup(self,"Help",init_lines=self.__help_lines) + self.popup = Popup(self,"Help",init_lines=self.__help_lines, height_req = 0.75) elif chr(c) == 'p': self.show_preferences() return diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index c1dbbb9a8..f4b886b69 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -106,8 +106,15 @@ class Popup: crow+=1 def handle_resize(self): - hr = self.height_req - wr = self.width_req + if isinstance(self.height_req, float) and 0.0 < self.height_req <= 1.0: + hr = int( (self.parent.rows - 2) * self.height_req ) + else: + hr = self.height_req + + if isinstance(self.width_req, float) and 0.0 < self.width_req <= 1.0: + wr = int( (self.parent.cols - 2) * self.width_req ) + else: + wr = self.width_req log.debug("Resizing(or creating) popup window") diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index f2d6a482f..21b6c8e7a 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -740,6 +740,6 @@ class TorrentDetail(BaseMode, component.Component): torrent_actions_popup(self,[self.torrentid],action=ACTION.TORRENT_OPTIONS) return elif chr(c) == 'h': - self.popup = Popup(self,"Help",init_lines=self.__help_lines) + self.popup = Popup(self,"Help",init_lines=self.__help_lines, height_req=0.75) self.refresh()