SkyGui.cpp   SkyGui.cpp 
skipping to change at line 146 skipping to change at line 146
animLeftBarTimeLine->start(); animLeftBarTimeLine->start();
} }
buttonBarPath->setZValue(-0.1); buttonBarPath->setZValue(-0.1);
updateBarsPos(); updateBarsPos();
} }
void SkyGui::resizeEvent(QGraphicsSceneResizeEvent* event) void SkyGui::resizeEvent(QGraphicsSceneResizeEvent* event)
{ {
QGraphicsWidget::resizeEvent(event); QGraphicsWidget::resizeEvent(event);
updateBarsPos(); updateBarsPos();
} }
void SkyGui::hoverMoveEvent(QGraphicsSceneHoverEvent* event) void SkyGui::hoverMoveEvent(QGraphicsSceneHoverEvent* event)
{ {
const int hh = geometry().height(); const int hh = geometry().height();
double x = event->pos().x(); double x = event->pos().x();
double y = event->pos().y(); double y = event->pos().y();
double maxX = winBar->boundingRect().width()+2.*buttonBarPath->getRo undSize(); double maxX = winBar->boundingRect().width()+2.*buttonBarPath->getRo undSize();
double maxY = hh-(winBar->boundingRect().height()+buttonBar->boundin gRect().height()+2.*buttonBarPath->getRoundSize()); double maxY = hh-(winBar->boundingRect().height()+buttonBar->boundin gRect().height()+2.*buttonBarPath->getRoundSize());
skipping to change at line 207 skipping to change at line 207
winBar->setPos(round(newWinBarX), round(newWinBarY)); winBar->setPos(round(newWinBarX), round(newWinBarY));
updatePath = true; updatePath = true;
} }
double rangeY = buttonBar->boundingRectNoHelpLabel().height()+0.5-7. -buttonBarPath->getRoundSize(); double rangeY = buttonBar->boundingRectNoHelpLabel().height()+0.5-7. -buttonBarPath->getRoundSize();
const qreal newButtonBarX = winBar->boundingRectNoHelpLabel().right( )+buttonBarPath->getRoundSize(); const qreal newButtonBarX = winBar->boundingRectNoHelpLabel().right( )+buttonBarPath->getRoundSize();
const qreal newButtonBarY = hh-buttonBar->boundingRectNoHelpLabel(). height()-buttonBarPath->getRoundSize()+0.5+(1.-animBottomBarTimeLine->curre ntValue())*rangeY; const qreal newButtonBarY = hh-buttonBar->boundingRectNoHelpLabel(). height()-buttonBarPath->getRoundSize()+0.5+(1.-animBottomBarTimeLine->curre ntValue())*rangeY;
if (buttonBar->pos().x()!=newButtonBarX || buttonBar->pos().y()!=new ButtonBarY) if (buttonBar->pos().x()!=newButtonBarX || buttonBar->pos().y()!=new ButtonBarY)
{ {
buttonBar->setPos(round(newButtonBarX), round(newButtonBarY) ); buttonBar->setPos(round(newButtonBarX), round(newButtonBarY) );
updatePath = true; updatePath = true;
} }
if (lastButtonbarWidth != buttonBar->boundingRectNoHelpLabel().width ()) if (lastButtonbarWidth != buttonBar->boundingRectNoHelpLabel().width ())
{ {
updatePath = true; updatePath = true;
lastButtonbarWidth = (int)(buttonBar->boundingRectNoHelpLabe lastButtonbarWidth = (int)(buttonBar->boundi
l().width()); ngRectNoHelpLabel().width());
} }
if (updatePath) if (updatePath)
buttonBarPath->updatePath(buttonBar, winBar); buttonBarPath->updatePath(buttonBar, winBar);
const qreal newProgressBarX = ww-progressBarMgr->boundingRect().widt const qreal newProgressBarX = ww-progressBarMgr->boundingRect().widt
h()-5; h()-20;
const qreal newProgressBarY = hh-progressBarMgr->boundingRect().heig const qreal newProgressBarY = hh-progressBarMgr->boundingRect().heig
ht()-5; ht()+7;
progressBarMgr->setPos(newProgressBarX, newProgressBarY); progressBarMgr->setPos(newProgressBarX, newProgressBarY);
progressBarMgr->setZValue(400);
// Update position of the auto-hide buttons // Update position of the auto-hide buttons
autoHidebts->setPos(0, hh-autoHidebts->childrenBoundingRect().height ()+1); autoHidebts->setPos(0, hh-autoHidebts->childrenBoundingRect().height ()+1);
double opacity = qMax(animLeftBarTimeLine->currentValue(), animBotto mBarTimeLine->currentValue()); double opacity = qMax(animLeftBarTimeLine->currentValue(), animBotto mBarTimeLine->currentValue());
autoHidebts->setOpacity(opacity < 0.01 ? 0.01 : opacity); // W ork around a qt bug autoHidebts->setOpacity(opacity < 0.01 ? 0.01 : opacity); // W ork around a qt bug
} }
void SkyGui::setStelStyle(const StelStyle& style) void SkyGui::setStelStyle(const StelStyle& style)
{ {
if (style.confSectionName=="night_color") if (style.confSectionName=="night_color")
 End of changes. 5 change blocks. 
9 lines changed or deleted 10 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/