fix overlapping X button for very long window names

[irc/quakenet/qwebirc.git] / js / ui / frontends / qui.js

diff --git a/js/ui/frontends/qui.js b/js/ui/frontends/qui.js
index 57846b0e02c83d5c36c8a1ed3982c14bef8a6966..5d82ffc98bfb92800dafd1bc5dfc18b16ead2221 100644 (file)
--- a/js/ui/frontends/qui.js
+++ b/js/ui/frontends/qui.js
@@ -41,16 +41,25 @@ qwebirc.ui.QUI = new Class({
     this.reflow = this.qjsui.reflow.bind(this.qjsui);
     
     this.tabs.addEvent("mousewheel", function(x) {
-      if(this.sideTabs)
-        return;
-
       var event = new Event(x);
+      var up, down;
+      if(this.sideTabs) {
+        var p = this.qjsui.left;
+
+        /* don't scroll if we're scrollable */
+        if(p.getScrollSize().y > p.clientHeight)
+          return;
+
+        up = event.wheel < 0;
+        down = event.wheel > 0;
+      } else {
+        up = event.wheel > 0;
+        down = event.wheel < 0;
+      }
 
-      /* up */
-      if(event.wheel > 0) {
+      if(up) {
         this.nextWindow();
-      } else if(event.wheel < 0) {
-        /* down */
+      } else if(down) {
         this.prevWindow();
       }
       event.stop();
@@ -331,7 +340,7 @@ qwebirc.ui.QUI.JSUI = new Class({
     var docsize = this.sizer.getSize();
     
     var mheight = (docsize.y - topsize.y - bottomsize.y - topicsize.y);
-    var mwidth = (docsize.x - rightsize.x);
+    var mwidth = (docsize.x - rightsize.x - leftsize.x);
 
     left.setStyle("top", topsize.y);
     topic.setStyle("top", topsize.y);