diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 78cc0110..85efbd1d 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -17,11 +17,10 @@ class Window(QWebView): def __init__(self, basename, webapp_port): QWebView.__init__(self) self.setWindowTitle("{0} | OnionShare".format(basename)) - self.resize(550, 350) - self.setMinimumSize(550, 300) - self.setMaximumSize(550, 900) + self.resize(580, 400) + self.setMinimumSize(580, 400) + self.setMaximumSize(580, 400) self.load(QUrl("http://127.0.0.1:{0}".format(webapp_port))) - self.frame = self.page().currentFrame() def alert(msg, icon=QMessageBox.NoIcon): dialog = QMessageBox() diff --git a/onionshare_gui/static/onionshare.js b/onionshare_gui/static/onionshare.js index 95c4a26a..c470268d 100644 --- a/onionshare_gui/static/onionshare.js +++ b/onionshare_gui/static/onionshare.js @@ -4,10 +4,6 @@ $(function(){ function update($msg) { var $line = $('
  • ').append($msg); $('#log').append($line); - - // scroll to bottom - set_log_height(); - $('#log').scrollTop($('#log').height()); } function copy_to_clipboard() { @@ -116,12 +112,4 @@ $(function(){ }); } }); - - // make sure the log always has a height set, so it will have its own scrollbar - function set_log_height() { - var new_height = $(document).height() - 140; // header = 100, footer = 40 - $('#log').css('height', new_height); - } - set_log_height(); - $.resize(set_log_height); }); diff --git a/onionshare_gui/static/style.css b/onionshare_gui/static/style.css index 3a049857..1594c506 100644 --- a/onionshare_gui/static/style.css +++ b/onionshare_gui/static/style.css @@ -56,6 +56,7 @@ ul#log { margin: 0; padding: 0; list-style: none; + height: 258px; overflow: auto; word-wrap: break-word; font-family: arial;