StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #162 from F1ynn/friendlist-fix

Browse Source 
Fix friendList mixed horizontal & vertical scroll, improved scrollbar theme on OS X
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-07-24 11:48:37 +02:00
commit 5c327cf378
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ui/friendList/friendList.css
View File

@ -1,34 +1,34 @@
QScrollArea {
background: #414141!important;
background: #414141;
}
QScrollBar:vertical {
background: #414141!important;
width: 14px!important;
margin-top: 2px!important;
margin-bottom: 2px!important;
background: transparent;
width: 14px;
margin-top: 2px;
margin-bottom: 2px;
}
QScrollBar:handle:vertical {
background: #1c1c1c!important;
min-height: 20px!important;
border-radius: 3px!important;
margin-left: 3px!important;
margin-right: 1px!important;
background: rgba(18, 18, 18, 204);
min-height: 20px;
border-radius: 3px;
margin-left: 3px;
margin-right: 1px;
}
QScrollBar:handle:vertical:hover {
background: #2d2d2d!important;
background: rgba(35, 35, 35, 204);
}
QScrollBar:handle:vertical:pressed {
background: #171717!important;
background: rgba(13, 13, 13, 204);
}
QScrollBar:add-line:vertical {height: 0px!important;subcontrol-position: bottom!important;subcontrol-origin: margin!important;}
QScrollBar:add-line:vertical {height: 0px;subcontrol-position: bottom;subcontrol-origin: margin;}
QScrollBar:sub-line:vertical {height: 0px!important;subcontrol-position: top!important;subcontrol-origin: margin!important;}
QScrollBar:sub-line:vertical {height: 0px;subcontrol-position: top;subcontrol-origin: margin;}
QScrollBar:add-page:vertical, QScrollBar::sub-page:vertical {
background: none!important;
background: none;
}

6
widget/widget.cpp
View File

@ -1213,11 +1213,7 @@ bool Widget::eventFilter(QObject *, QEvent *event)
if (event->type() == QEvent::Wheel)
{
QWheelEvent * whlEvnt = static_cast< QWheelEvent * >( event );
if (whlEvnt->angleDelta().x() != 0)
{
event->accept();
return true;
}
whlEvnt->angleDelta().setX(0);
}
return false;
}