Commit eb64844c authored by Matthias Möller's avatar Matthias Möller
Browse files

toolbar size will not be changed (only indirect via splitter::setSizes)

refs #531 part 1

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14357 383ad7c9-94d9-4d36-a494-682f7c89f535
parent ead1b5dd
...@@ -833,11 +833,11 @@ void CoreWidget::delete_garbage() { ...@@ -833,11 +833,11 @@ void CoreWidget::delete_garbage() {
void CoreWidget::slotPasteView( ) { void CoreWidget::slotPasteView( ) {
QSize size; QSize size;
int toolBarWidth; int splitterWidth;
examiner_widgets_[PluginFunctions::activeExaminer()]->actionPasteView(&size,&toolBarWidth); examiner_widgets_[PluginFunctions::activeExaminer()]->actionPasteView(&size,&splitterWidth);
//resize the toolbox and splitter //resize the toolbox and splitter
if (toolBarWidth != -1) if (splitterWidth != -1)
{ {
QList<int> sizes = toolSplitter_->sizes(); QList<int> sizes = toolSplitter_->sizes();
unsigned sum_size = sizes[0]+sizes[1]; unsigned sum_size = sizes[0]+sizes[1];
...@@ -845,17 +845,16 @@ void CoreWidget::slotPasteView( ) { ...@@ -845,17 +845,16 @@ void CoreWidget::slotPasteView( ) {
bool onRight = OpenFlipperSettings().value("Core/Gui/ToolBoxes/ToolBoxOnTheRight").toBool(); bool onRight = OpenFlipperSettings().value("Core/Gui/ToolBoxes/ToolBoxOnTheRight").toBool();
if (onRight) if (onRight)
{ {
sizes[1] = toolBarWidth; sizes[1] = splitterWidth;
sizes[0] = sum_size - toolBarWidth; sizes[0] = sum_size - splitterWidth;
} }
else else
{ {
sizes[0] = toolBarWidth; sizes[0] = splitterWidth;
sizes[1] = sum_size - toolBarWidth; sizes[1] = sum_size - splitterWidth;
} }
toolSplitter_->setSizes(sizes); toolSplitter_->setSizes(sizes);
viewerToolbar_->resize(toolBarWidth, viewerToolbar_->height());
} }
//resize window //resize window
......
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