mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-21 16:29:43 +01:00
Code Issues Releases Wiki Activity

* Fixed TWK-107: paint dividers between toolbar, central widget and status bar.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2011-08-13 04:15:58 +02:00
parent 5e6751dc64
commit aa68229ac6
4 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/utils/proxystyle.cpp
View File

@ -80,6 +80,11 @@ ProxyStyle::drawControl( ControlElement ce, const QStyleOption* opt, QPainter* p
p->setPen( QColor( 0x8c, 0x8c, 0x8c ) );
p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() );
}
else
{
p->setPen( QColor( 0xff, 0xff, 0xff ) );
p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() );
}
}
else
QProxyStyle::drawControl( ce, opt, p, w );

6
src/libtomahawk/viewmanager.cpp
View File

@ -80,11 +80,6 @@ ViewManager::ViewManager( QObject* parent )
m_infobar = new InfoBar();
m_stack = new QStackedWidget();
QFrame* line = new QFrame();
line->setFrameStyle( QFrame::HLine );
line->setStyleSheet( "border: 1px solid gray;" );
line->setMaximumHeight( 1 );
m_splitter = new AnimatedSplitter();
m_splitter->setOrientation( Qt::Vertical );
m_splitter->setChildrenCollapsible( false );
@ -101,7 +96,6 @@ ViewManager::ViewManager( QObject* parent )
m_widget->layout()->addWidget( m_infobar );
m_widget->layout()->addWidget( m_topbar );
m_widget->layout()->addWidget( line );
m_widget->layout()->addWidget( m_splitter );
m_superCollectionView = new ArtistView();

11
src/tomahawkwindow.cpp
View File

@ -93,6 +93,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
ui->centralWidget->setContentsMargins( 0, 0, 0, 0 );
ui->centralWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
ui->centralWidget->layout()->setMargin( 0 );
ui->centralWidget->layout()->setSpacing( 0 );
setupSideBar();
setupToolBar();
@ -174,6 +175,16 @@ TomahawkWindow::applyPlatformTweaks()
#ifdef Q_WS_MAC
setUnifiedTitleAndToolBarOnMac( true );
#endif
#ifdef Q_OS_MAC
ui->hline1->setMaximumHeight( 0 );
ui->hline2->setMaximumHeight( 0 );
ui->hline1->hide();
ui->hline2->hide();
#else
ui->hline1->setStyleSheet( "border: 1px solid gray;" );
ui->hline2->setStyleSheet( "border: 1px solid gray;" );
#endif
}

34
src/tomahawkwindow.ui
View File

@ -15,6 +15,22 @@
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QFrame" name="hline1">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
@ -27,6 +43,22 @@
<widget class="QWidget" name="playlistWidget" native="true"/>
</widget>
</item>
<item>
<widget class="QFrame" name="hline2">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menuBar">
@ -35,7 +67,7 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>22</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuSettings">