iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix variable setting

Browse Source
This commit is contained in:
craig.p.drummond
2015-02-06 22:39:17 +00:00
committed by craig.p.drummond
parent e13a9b3547
commit 28a6e9263d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
support/gtkproxystyle.cpp
View File

@@ -59,8 +59,7 @@ static bool useOverlayStyleScrollbars(bool use)
}
GtkProxyStyle::GtkProxyStyle(int modView, bool thinSb, bool styleSpin, const QMap<QString, QString> &c)
: TouchProxyStyle(modView && (SB_Gtk==sbarType || !qApp->style()->styleHint(SH_ScrollView_FrameOnlyAroundContents, 0, 0, 0)) ? modView : 0,
styleSpin, useOverlayStyleScrollbars(thinSb))
: TouchProxyStyle(modView, styleSpin, useOverlayStyleScrollbars(thinSb))
, css(c)
{
shortcutHander=new ShortcutHandler(this);

3
support/proxystyle.h
View File

@@ -37,8 +37,9 @@ public:
VF_Top = 0x02
};
ProxyStyle(int modView) : modViewFrame(modView) { }
ProxyStyle(int modView=VF_None) : modViewFrame(modView) { }
void setModViewFrame(int modView) { modViewFrame=modView; }
void polish(QPalette &pal) { QProxyStyle::polish(pal); }
void polish(QApplication *app) { QProxyStyle::polish(app); }
void polish(QWidget *widget);

4
support/touchproxystyle.cpp
View File

@@ -160,8 +160,7 @@ public:
};
TouchProxyStyle::TouchProxyStyle(int modView, bool touchSpin, bool gtkOverlayStyleScrollbar)
: ProxyStyle(modView)
, touchStyleSpin(touchSpin)
: touchStyleSpin(touchSpin)
, sbarPlainViewWidth(-1)
{
spinButtonRatio=touchSpin && Utils::touchFriendly() ? 1.5 : 1.25;
@@ -174,6 +173,7 @@ TouchProxyStyle::TouchProxyStyle(int modView, bool touchSpin, bool gtkOverlaySty
} else {
sbarType=SB_Standard;
}
setModViewFrame(modView && (SB_Gtk==sbarType || !qApp->style()->styleHint(SH_ScrollView_FrameOnlyAroundContents, 0, 0, 0)) ? modView : 0);
}
TouchProxyStyle::~TouchProxyStyle()