From e57923c7d767f5a532bc35571d74a5470eb76314 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 5 Apr 2018 14:21:24 +0200 Subject: built-in style palette --- src/gui/mainwindow.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/gui/mainwindow.cpp') diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 26e19b6..9ce340a 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -28,7 +28,11 @@ MainWindow::MainWindow(QWidget *parent) : _toolPalette = new ToolPalette(this); addToolBar(_toolPalette); - _tikzScene = new TikzScene(_tikzDocument, _toolPalette, this); + _stylePalette = new StylePalette(this); + addDockWidget(Qt::RightDockWidgetArea, _stylePalette); + + + _tikzScene = new TikzScene(_tikzDocument, _toolPalette, _stylePalette, this); ui->tikzView->setScene(_tikzScene); _pristine = true; @@ -79,11 +83,16 @@ void MainWindow::changeEvent(QEvent *event) { if (event->type() == QEvent::ActivationChange && isActiveWindow()) { tikzit->setActiveWindow(this); - tikzit->stylePalette()->raise(); + //tikzit->stylePalette()->raise(); } QMainWindow::changeEvent(event); } +StylePalette *MainWindow::stylePalette() const +{ + return _stylePalette; +} + void MainWindow::updateFileName() { setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); -- cgit v1.2.3