Adjust the clickable area for logging out to include the user's icon.

Author: ntoll

securedrop_client/gui/widgets.py

@@ -448,17 +448,20 @@ def __init__(self):
         # Login button
         self.login_button = LoginButton()
 
+        # User button
+        self.user_button = UserButton()
+
         # User icon
-        self.user_icon = QLabel()
+        self.user_icon = UserIconLabel()
         self.user_icon.setObjectName('user_icon')  # Set css id
         self.user_icon.setFixedSize(QSize(30, 30))
         self.user_icon.setAlignment(Qt.AlignCenter)
         self.user_icon_font = QFont()
         self.user_icon_font.setLetterSpacing(QFont.AbsoluteSpacing, 0.58)
         self.user_icon.setFont(self.user_icon_font)
-
-        # User button
-        self.user_button = UserButton()
+        self.user_icon.clicked.connect(self.user_button.click)
+        # Set cursor.
+        self.user_icon.setCursor(QCursor(Qt.PointingHandCursor))
 
         # Add widgets to user auth layout
         layout.addWidget(self.login_button, 1)
@@ -488,6 +491,17 @@ def hide(self):
         self.login_button.show()
 
 
+class UserIconLabel(QLabel):
+    """
+    Makes a label clickable. (For the label containing the user icon.)
+    """
+
+    clicked = pyqtSignal()
+
+    def mousePressEvent(self, e):
+        self.clicked.emit()
+
+
 class UserButton(SvgPushButton):
     """An menu button for the journalist menu
 

tests/gui/test_widgets.py

@@ -22,7 +22,7 @@
     ErrorStatusBar, ActivityStatusBar, UserProfile, UserButton, UserMenu, LoginButton, \
     ReplyBoxWidget, ReplyTextEdit, SourceConversationWrapper, StarToggleButton, LoginOfflineLink, \
     LoginErrorBar, EmptyConversationView, FramelessDialog, ExportDialog, PrintDialog, \
-    PasswordEdit, SourceProfileShortWidget
+    PasswordEdit, SourceProfileShortWidget, UserIconLabel
 from tests import factory
 
 
@@ -383,6 +383,13 @@ def test_UserProfile_hide(mocker):
     up.login_button.show.assert_called_once_with()
 
 
+def test_UserIconLabel_clicks(mocker):
+    uil = UserIconLabel()
+    uil.clicked = mocker.MagicMock()
+    uil.mousePressEvent(None)
+    uil.clicked.emit.assert_called_once_with()
+
+
 def test_UserButton_setup(mocker):
     ub = UserButton()
     ub.menu = mocker.MagicMock()