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

- Thinner splitters for more styles

Browse Source 
- Because of the above, dont draw mac focus highlight for views
This commit is contained in:
craig.p.drummond
2014-10-02 17:16:13 +00:00
parent 7b13d2aad9
commit bd044155e6
20 changed files with 126 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
support/gtkproxystyle.cpp
View File

@@ -58,9 +58,9 @@ static bool useOverlayStyleScrollbars(bool use)
return use;
}
GtkProxyStyle::GtkProxyStyle(bool thinSb, bool styleSpin, const QMap<QString, QString> &c, bool modView)
: TouchProxyStyle(styleSpin, useOverlayStyleScrollbars(thinSb))
, modViewFrame(modView && (SB_Gtk==sbarType || !styleHint(SH_ScrollView_FrameOnlyAroundContents, 0, 0, 0)))
GtkProxyStyle::GtkProxyStyle(int modView, bool thinSb, bool styleSpin, const QMap<QString, QString> &c)
: TouchProxyStyle(modView && (SB_Gtk==sbarType || !styleHint(SH_ScrollView_FrameOnlyAroundContents, 0, 0, 0)) ? modView : 0,
styleSpin, useOverlayStyleScrollbars(thinSb))
, css(c)
{
shortcutHander=new ShortcutHandler(this);
@@ -85,24 +85,6 @@ int GtkProxyStyle::styleHint(StyleHint hint, const QStyleOption *option, const Q
return TouchProxyStyle::styleHint(hint, option, widget, returnData);
}
void GtkProxyStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
{
TouchProxyStyle::drawPrimitive(element, option, painter, widget);
if (modViewFrame && PE_Frame==element && widget && widget->property(GtkStyle::constHideFrameProp).isValid()) {
const QRect &r=option->rect;
if (option->palette.base().color()==Qt::transparent) {
painter->setPen(QPen(QApplication::palette().color(QPalette::Base), 1));
} else {
painter->setPen(QPen(option->palette.base(), 1));
}
if (Qt::LeftToRight==option->direction) {
painter->drawLine(r.topRight()+QPoint(0, 1), r.bottomRight()+QPoint(0, -1));
} else {
painter->drawLine(r.topLeft()+QPoint(0, 1), r.bottomLeft()+QPoint(0, -1));
}
}
}
void GtkProxyStyle::polish(QWidget *widget)
{
#ifndef ENABLE_KDE_SUPPORT