Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix no_activate_on_click style not delegating to the current style

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-09 00:11:03 +05:30
parent 6fb8c25e89
commit 68667f5f56
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/progress_indicator/QProgressIndicator.cpp
View File

@ -163,7 +163,7 @@ class CalibreStyle: public QProxyStyle {
return button_layout; return button_layout;
case SH_FormLayoutFieldGrowthPolicy: case SH_FormLayoutFieldGrowthPolicy:
return QFormLayout::FieldsStayAtSizeHint; // Do not have fields expand to fill all available space in QFormLayout return QFormLayout::FieldsStayAtSizeHint; // Do not have fields expand to fill all available space in QFormLayout
default: default:
break; break;
} }
return QProxyStyle::styleHint(hint, option, widget, returnData); return QProxyStyle::styleHint(hint, option, widget, returnData);
@ -302,6 +302,7 @@ int load_style(QHash<int,QString> icon_map) {
class NoActivateStyle: public QProxyStyle { class NoActivateStyle: public QProxyStyle {
public: public:
NoActivateStyle(QStyle *base) : QProxyStyle(base) { }
int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const { int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const {
if (hint == QStyle::SH_ItemView_ActivateItemOnSingleClick) return 0; if (hint == QStyle::SH_ItemView_ActivateItemOnSingleClick) return 0;
return QProxyStyle::styleHint(hint, option, widget, returnData); return QProxyStyle::styleHint(hint, option, widget, returnData);
@ -309,7 +310,8 @@ class NoActivateStyle: public QProxyStyle {
}; };
void set_no_activate_on_click(QWidget *widget) { void set_no_activate_on_click(QWidget *widget) {
widget->setStyle(new NoActivateStyle); QStyle *base_style = widget->style();
if (base_style) widget->setStyle(new NoActivateStyle(base_style));
} }
class TouchMenuStyle: public QProxyStyle { class TouchMenuStyle: public QProxyStyle {