diff options
Diffstat (limited to 'kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch')
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch b/kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch deleted file mode 100644 index d78cc7c8efb4..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: kdeui/kurllabel.cpp -=================================================================== ---- kdeui/kurllabel.cpp (revision 504600) -+++ kdeui/kurllabel.cpp (revision 504601) -@@ -405,6 +405,8 @@ - QRect KURLLabel::activeRect() const - { - QRect r( contentsRect() ); -+ if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed))) -+ return r; //fixed size is sometimes used with pixmap - int hAlign = QApplication::horizontalAlignment( alignment() ); - int indentX = (hAlign && indent()>0) ? indent() : 0; - QFontMetrics fm(font()); -@@ -422,18 +424,26 @@ - - void KURLLabel::setMargin( int margin ) - { -- QLabel::setMargin(margin); -- d->MarginAltered = true; -+ QLabel::setMargin(margin); -+ d->MarginAltered = true; - } - - void KURLLabel::setFocusPolicy( FocusPolicy policy ) - { -- QLabel::setFocusPolicy(policy); -- if (!d->MarginAltered) { -- QLabel::setMargin(policy == NoFocus ? 0 : 3); //better default : better look when focused -- } -+ QLabel::setFocusPolicy(policy); -+ if (!d->MarginAltered) { -+ QLabel::setMargin(policy == NoFocus ? 0 : 3); //better default : better look when focused -+ } - } - -+void KURLLabel::setSizePolicy ( QSizePolicy policy ) -+{ -+ QLabel::setSizePolicy(policy); -+ if (!d->MarginAltered && policy.horData()==QSizePolicy::Fixed && policy.verData()==QSizePolicy::Fixed) { -+ QLabel::setMargin(0); //better default : better look when fixed size -+ } -+} -+ - void KURLLabel::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -Index: kdeui/kurllabel.h -=================================================================== ---- kdeui/kurllabel.h (revision 504600) -+++ kdeui/kurllabel.h (revision 504601) -@@ -163,6 +163,11 @@ - */ - virtual void setFocusPolicy ( FocusPolicy policy ); - -+ /** -+ * Reimplemented for internal reasons, the API is not affected. -+ */ -+ virtual void setSizePolicy ( QSizePolicy ); -+ - public slots: - /** - * Turns on or off the underlining. |