Commit 5083df91 authored by LE BRETON Come's avatar LE BRETON Come

Merge branch 'feature/new-dtk-widgets' of gitlab.inria.fr:dtk/dtk-widgets into...

Merge branch 'feature/new-dtk-widgets' of gitlab.inria.fr:dtk/dtk-widgets into feature/new-dtk-widgets
parents d5575904 788d0860
......@@ -98,14 +98,14 @@ void dtkWidgetsMenuNavigationFacade::paintEvent(QPaintEvent *event)
{
QFrame::paintEvent(event);
dtkFontAwesome::instance()->setDefaultOption("color", dtkThemesEngine::instance()->color("@bgalt"));
dtkFontAwesome::instance()->setDefaultOption("color", dtkThemesEngine::instance()->color("@base0"));
QRect rect(5, 10, 28, 32);
QPainter painter(this);
painter.setRenderHints(QPainter::Antialiasing);
painter.setPen(Qt::NoPen);
painter.setBrush(dtkThemesEngine::instance()->color("@base6"));
painter.setBrush(dtkThemesEngine::instance()->color("@base7"));
painter.drawRoundedRect(rect, 5, 5);
painter.drawPixmap(10, 20, 16, 16, dtkFontAwesome::instance()->icon(fa::chevronleft).pixmap(16, 16));
painter.setPen(dtkThemesEngine::instance()->color("@base8"));
......@@ -207,13 +207,10 @@ void dtkWidgetsMenuItemFacade::paintEvent(QPaintEvent *event)
if(menu_item->isCustom())
return;
dtkFontAwesome::instance()->setDefaultOption("color", ::fg_color);
dtkFontAwesome::instance()->setDefaultOption("color", dtkThemesEngine::instance()->color("@fg"));
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
// painter.setPen(::bg_color);
// painter.setBrush(::bg_color);
// painter.drawRoundedRect(event->rect(), 5, 5);
painter.setPen(dtkThemesEngine::instance()->color("@fg"));
painter.drawPixmap(10, 10, 16, 16, dtkFontAwesome::instance()->icon(this->menu_item->icon()).pixmap(16, 16));
painter.drawText(::margin + 16 + ::margin, ::margin * 2 + 2, this->menu_item->title());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment