Remove the exit button

It overlaps with the scrollbar, and our interface already uses context
menu for leaving a channel.

Author: zcbenz

lib/view/channel-item.js

@@ -20,7 +20,6 @@ class ChannelItem {
     }
 
     this.hover = false
-    this.hoverExitButton = false
     this.isSelected = false
     this.disabled = false
 
@@ -30,17 +29,13 @@ class ChannelItem {
     this.view.onDraw = this._draw.bind(this)
     this.view.onMouseEnter = () => {
       this.hover = true
-      this.hoverExitButton = false
       this.view.schedulePaint()
     }
     this.view.onMouseLeave = () => {
       this.hover = false
-      this.hoverExitButton = false
       this.view.schedulePaint()
     }
     this.view.onMouseUp = this._click.bind(this)
-    if (channel.type === 'dm')
-      this.view.onMouseMove = this._updateExitButtonHover.bind(this)
   }
 
   unload() {
@@ -114,12 +109,9 @@ class ChannelItem {
     // Draw mentions count.
     if (this.channel.mentions > 0)
       this._drawMentionsCount(painter, mentionsRadius, padding + textRect.width, bounds.height, textRect.height)
-    // Draw DM-specific items.
-    if (this.channel.type === 'dm') {
+    // Draw presence indicator.
+    if (this.channel.type === 'dm')
       this._drawPresenceIndicator(painter, bounds, attributes)
-      if (this.hover && this.channel.mentions === 0)
-        this._drawExitButton(painter, bounds, attributes)
-    }
   }
 
   _drawMentionsCount(painter, radius, x, height, textHeight) {
@@ -165,72 +157,20 @@ class ChannelItem {
     }
   }
 
-  _drawExitButton(painter, bounds, attributes) {
-    const {exitButtonXHeight, exitButtonRadius, padding} = theme.channelItem
-    const xPos = bounds.width - padding - exitButtonRadius
-    const arcPos = {x: xPos, y: bounds.height / 2}
-    painter.setStrokeColor(this.hoverExitButton ? theme.channelItem.selectedColor
-                                                : theme.channelItem.normalColor)
-    painter.beginPath()
-    painter.setLineWidth(1)
-    painter.arc(arcPos, exitButtonRadius, 0, 2 * Math.PI)
-    painter.translate({x: xPos, y: (bounds.height - exitButtonXHeight) / 2})
-    painter.moveTo({x: -(exitButtonXHeight / 2), y: 0})
-    painter.lineTo({x: exitButtonXHeight / 2, y: exitButtonXHeight})
-    painter.moveTo({x: - (exitButtonXHeight / 2), y: exitButtonXHeight})
-    painter.lineTo({x: exitButtonXHeight / 2, y: 0})
-    painter.stroke()
-  }
-
-  _updateExitButtonHover(view, event) {
-    if (this.channel.mentions > 0) {
-      this.hoverExitButton = false
-      this.view.schedulePaint()
-      return
-    }
-    const {exitButtonXHeight, exitButtonRadius, padding} = theme.channelItem
-    const bounds = view.getBounds()
-    const rect = {
-      left: bounds.width - padding - exitButtonRadius * 2,
-      top: bounds.height / 2 - exitButtonRadius,
-      right: bounds.width - padding,
-      bottom: bounds.height - exitButtonRadius,
-    }
-    const hoverExitButton = event.positionInView.x >= rect.left &
-                            event.positionInView.x <= rect.right &
-                            event.positionInView.y >= rect.top &
-                            event.positionInView.y <= rect.bottom
-    if (this.hoverExitButton != hoverExitButton) {
-      this.hoverExitButton = hoverExitButton
-      this.view.schedulePaint()
-    }
-  }
-
   _click(view, event) {
-    // Click on the exit button.
-    if (this.hoverExitButton) {
-      if (event.button === 1)
-        this._leave()
-      return true
-    }
-
     // Click on the channel item.
     if (event.button === 1) {
       // Left click to open channel.
       this.parent.selectChannelItem(this)
     } else {  // for GTK+ button could be 3 for trackpad right click.
       // Right click to show context menu.
       if (!this.menu) {
-        if (this.channel.type === 'channel') {
-          this.menu = gui.Menu.create([
-            { label: 'Popup to new window', onClick: this._popup.bind(this) },
-            { label: 'Leave channel', onClick: this._leave.bind(this) },
-          ])
-        } else {
-          this.menu = gui.Menu.create([
-            { label: 'Popup to new window', onClick: this._popup.bind(this) },
-          ])
-        }
+        const leaveLabel = this.channel.type === 'channel' ? 'Leave channel'
+                                                           : 'Close direct message'
+        this.menu = gui.Menu.create([
+          { label: 'Popup to new window', onClick: this._popup.bind(this) },
+          { label: leaveLabel, onClick: this._leave.bind(this) },
+        ])
       }
       this.menu.popup()
     }