Fix scaling issues for notifications with long texts

- If a notification contained a large body of text, and wordWrap is on,
it took up too much vertical space. This has been fixed and the
notification now takes up the minimum vertical space required.

Author: dschreij

QNotifications/QNotification.py

@@ -30,6 +30,19 @@
 __author__ = u"Daniel Schreij"
 __license__ = u"GPLv3"
 
+class MessageLabel(QtWidgets.QLabel):
+	""" Subclass of QLabel, which reimplements the resizeEvent() function. This
+	is necessary because otherwise the notifications take up too much vertical
+	space when texts they display become longer. This is because normally the height 
+	of a notification is calculated as the minimum height necessary for the text 
+	when the widget is horizontally resized to its minimum. """
+
+	def resizeEvent(self, event):
+		super(MessageLabel, self).resizeEvent(event)
+		if ( self.wordWrap() and \
+			self.sizePolicy().verticalPolicy() == QtWidgets.QSizePolicy.Minimum ):
+			self.setMaximumHeight( self.heightForWidth( self.width() ) )
+
 class QNotification(QtWidgets.QWidget):
 	""" Class representing a single notification """
 
@@ -55,15 +68,20 @@ def __init__(self, message, category, *args, **kwargs):
 		# Set Object name for reference
 		self.setObjectName(category)
 		self.setLayout(QtWidgets.QHBoxLayout())
+		self.setContentsMargins(0,0,0,0)
+		# self.setSizePolicy(QtWidgets.QSizePolicy.Minimum, 
+		# 	QtWidgets.QSizePolicy.Fixed)
 
 		# Create a message area
 		#contents = QtWidgets.QWidget(self)
 		messageArea = QtWidgets.QHBoxLayout()
 		messageArea.setContentsMargins(0,0,0,0)
 
 		# Create the layout
-		self.message_display = QtWidgets.QLabel()
+		self.message_display = MessageLabel()
 		self.message_display.setObjectName("message")
+		self.message_display.setSizePolicy(QtWidgets.QSizePolicy.Minimum, 
+			QtWidgets.QSizePolicy.Minimum)
 		self.message_display.setWordWrap(True)
 
 		# Create a button that can close notifications
@@ -75,7 +93,7 @@ def __init__(self, message, category, *args, **kwargs):
 
 		# Add everything together
 		messageArea.addWidget(self.message_display)
-		messageArea.addStretch(1)
+		# messageArea.addStretch(1)
 		messageArea.addWidget(close_button)
 		self.layout().addLayout(messageArea)
 

QNotifications/QNotificationArea.py

@@ -46,6 +46,7 @@ class QNotificationArea(QtWidgets.QWidget):
 		color: #FFFFFF;
 		padding: 0px;
 		margin: 0px;
+		width: 100%;
 	}
 
 	QNotification #closeButton{
@@ -115,7 +116,7 @@ def __init__(self, targetWidget, *args, **kwargs):
 
 		# Store original target classes resizeEvent to be called in our own
 		# function
-		self.old_target_resize_event = targetWidget.resizeEvent
+		self.target_resize_event = targetWidget.resizeEvent
 		# Overwrite resizeEvent function of targetWidget to capture it ourself
 		# (parent's resizeEvent will be called in our function too)
 		self.targetWidget.resizeEvent = self.resizeEvent
@@ -244,9 +245,10 @@ def remove(self, notification = None):
 	# Internal Qt functions
 	def resizeEvent(self, event):
 		""" Internal QT functions (do not call directly) """
-		self.old_target_resize_event(event)
+		self.target_resize_event(event)
 		newsize = event.size()		
 		self.setFixedWidth(newsize.width())
+		self.adjustSize()
 
 	def paintEvent(self, pe):
 		""" redefinition of paintEvent, to make class QNotificationArea available

example.py

@@ -61,7 +61,7 @@ def __setup_widget(self):
 		duration_label = QtWidgets.QLabel("Display duration: (ms)", display_widget)
 		self.message_duration = QtWidgets.QSpinBox(display_widget)
 		self.message_duration.setRange(500, 5000)
-		self.message_duration.setValue(2000)
+		self.message_duration.setValue(5000)
 		self.message_duration.setSingleStep(50)
 		# Entry effect
 		entryeffect_label = QtWidgets.QLabel("Entry effect: ", display_widget)
@@ -114,7 +114,6 @@ def __setup_notification_area(self, targetWidget):
 		return notification_area
 
 	def __process_combo_change(self, val):
-		new_selection = val
 		if self.sender() == self.entry_dropdown:
 			if val == "None":
 				self.entryduration_label.setDisabled(True)
@@ -164,7 +163,3 @@ def __submit_message(self):
 	print("App exiting with code {}".format(exitcode))
 	del(example)
 	sys.exit(exitcode)
-
-
-
-