Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

BookmarksToolBarButton: Don't change height in sizeHint

Browse Source
This commit is contained in:
David Rosca 2018-01-21 16:47:38 +01:00
parent 76116f636c
commit 825fc88c40
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/bookmarks/bookmarkstoolbarbutton.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Falkon - Qt web browser * Falkon - Qt web browser
* Copyright (C) 2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2014-2018 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -92,7 +92,9 @@ QSize BookmarksToolbarButton::sizeHint() const
} }
} }
return QSize(qMin(width, MAX_WIDTH), preferredHeight()); QSize s = QPushButton::sizeHint();
s.setWidth(qMin(width, MAX_WIDTH));
return s;
} }
QSize BookmarksToolbarButton::minimumSizeHint() const QSize BookmarksToolbarButton::minimumSizeHint() const
@ -109,12 +111,9 @@ QSize BookmarksToolbarButton::minimumSizeHint() const
width += PADDING + 8; width += PADDING + 8;
} }
return QSize(width, preferredHeight()); QSize s = QPushButton::minimumSizeHint();
} s.setWidth(width);
return s;
int BookmarksToolbarButton::preferredHeight() const
{
return fontMetrics().height() + PADDING * 2;
} }
void BookmarksToolbarButton::createMenu() void BookmarksToolbarButton::createMenu()

7
src/lib/bookmarks/bookmarkstoolbarbutton.h
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Falkon - Qt web browser * Falkon - Qt web browser
* Copyright (C) 2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2014-2018 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -42,9 +42,8 @@ public:
bool showOnlyText() const; bool showOnlyText() const;
void setShowOnlyText(bool show); void setShowOnlyText(bool show);
QSize sizeHint() const; QSize sizeHint() const override;
QSize minimumSizeHint() const; QSize minimumSizeHint() const override;
int preferredHeight() const;
private slots: private slots:
void createMenu(); void createMenu();