FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added close buttons to "closable" tabs.

Browse Source
This commit is contained in:
Martin Rotter 2014-01-19 12:27:45 +01:00
parent a455d21356
commit fe0614ad8c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/tabbar.cpp
View File

@ -4,6 +4,8 @@
#include "core/settings.h" #include "core/settings.h"
#include <QMouseEvent> #include <QMouseEvent>
#include <QToolButton>
#include <QStyle>
TabBar::TabBar(QWidget *parent) : QTabBar(parent) { TabBar::TabBar(QWidget *parent) : QTabBar(parent) {
@ -46,11 +48,14 @@ void TabBar::setTabType(int index, const TabBar::TabType &type) {
void TabBar::closeTabViaButton() { void TabBar::closeTabViaButton() {
QToolButton *close_button = qobject_cast<QToolButton*>(sender()); QToolButton *close_button = qobject_cast<QToolButton*>(sender());
QTabBar::ButtonPosition button_position = (ButtonPosition) style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition,
0,
this);;
if (close_button != NULL) { if (close_button != NULL) {
// Find index of tab for this close button. // Find index of tab for this close button.
for (int i = 0; i < count(); i++) { for (int i = 0; i < count(); i++) {
if (tabButton(i, QTabBar::RightSide) == close_button) { if (tabButton(i, button_position) == close_button) {
emit tabCloseRequested(i); emit tabCloseRequested(i);
return; return;
@ -91,8 +96,8 @@ void TabBar::mousePressEvent(QMouseEvent *event) {
// NOTE: This needs to be done here because // NOTE: This needs to be done here because
// destination does not know the original event. // destination does not know the original event.
if (event->button() & Qt::MiddleButton && Settings::instance()->value(APP_CFG_GUI, if (event->button() & Qt::MiddleButton && Settings::instance()->value(APP_CFG_GUI,
"tab_close_mid_button", "tab_close_mid_button",
true).toBool()) { true).toBool()) {
if (tabType(tab_index) == TabBar::Closable) { if (tabType(tab_index) == TabBar::Closable) {
// This tab is closable, so we can close it. // This tab is closable, so we can close it.
emit tabCloseRequested(tab_index); emit tabCloseRequested(tab_index);
@ -112,8 +117,8 @@ void TabBar::mouseDoubleClickEvent(QMouseEvent *event) {
// NOTE: This needs to be done here because // NOTE: This needs to be done here because
// destination does not know the original event. // destination does not know the original event.
if (event->button() & Qt::LeftButton && Settings::instance()->value(APP_CFG_GUI, if (event->button() & Qt::LeftButton && Settings::instance()->value(APP_CFG_GUI,
"tab_close_double_button", "tab_close_double_button",
true).toBool()) { true).toBool()) {
if (tabType(tab_index) == TabBar::Closable) { if (tabType(tab_index) == TabBar::Closable) {
// This tab is closable, so we can close it. // This tab is closable, so we can close it.
emit tabCloseRequested(tab_index); emit tabCloseRequested(tab_index);
@ -124,8 +129,8 @@ void TabBar::mouseDoubleClickEvent(QMouseEvent *event) {
// NOTE: This check could be unnecesary here and should be done in // NOTE: This check could be unnecesary here and should be done in
// destination object but we keep it here for consistency. // destination object but we keep it here for consistency.
else if (Settings::instance()->value(APP_CFG_GUI, else if (Settings::instance()->value(APP_CFG_GUI,
"tab_new_double_button", "tab_new_double_button",
true).toBool()) { true).toBool()) {
emit emptySpaceDoubleClicked(); emit emptySpaceDoubleClicked();
} }
} }

1
src/gui/tabbar.h
View File

@ -5,7 +5,6 @@
#include <QTabBar> #include <QTabBar>
#include <QVariant> #include <QVariant>
#include <QToolButton>
class TabBar : public QTabBar { class TabBar : public QTabBar {