mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Fix placement of notification area and dive computer name.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
cacf5b3b24
commit
39a11d7092
2 changed files with 3 additions and 4 deletions
|
@ -262,7 +262,7 @@ void DiveTemperatureItem::createTextItem(int sec, int mkelvin)
|
||||||
deg = get_temp_units(mkelvin, &unit);
|
deg = get_temp_units(mkelvin, &unit);
|
||||||
|
|
||||||
DiveTextItem *text = new DiveTextItem(this);
|
DiveTextItem *text = new DiveTextItem(this);
|
||||||
text->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
|
text->setAlignment(Qt::AlignRight | Qt::AlignBottom);
|
||||||
text->setBrush(getColor(TEMP_TEXT));
|
text->setBrush(getColor(TEMP_TEXT));
|
||||||
text->setPos(QPointF(hAxis->posAtValue(sec), vAxis->posAtValue(mkelvin)));
|
text->setPos(QPointF(hAxis->posAtValue(sec), vAxis->posAtValue(mkelvin)));
|
||||||
text->setText(QString("%1%2").arg(deg, 0, 'f', 1).arg(unit));
|
text->setText(QString("%1%2").arg(deg, 0, 'f', 1).arg(unit));
|
||||||
|
|
|
@ -146,7 +146,7 @@ void ProfileWidget2::setupItemOnScene()
|
||||||
cartesianPlane->setBottomAxis(timeAxis);
|
cartesianPlane->setBottomAxis(timeAxis);
|
||||||
cartesianPlane->setLeftAxis(profileYAxis);
|
cartesianPlane->setLeftAxis(profileYAxis);
|
||||||
|
|
||||||
diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignTop);
|
diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignBottom);
|
||||||
diveComputerText->setBrush(getColor(TIME_TEXT));
|
diveComputerText->setBrush(getColor(TIME_TEXT));
|
||||||
|
|
||||||
setupItem(reportedCeiling, timeAxis, profileYAxis, dataModel, DivePlotDataModel::CEILING, DivePlotDataModel::TIME, 1);
|
setupItem(reportedCeiling, timeAxis, profileYAxis, dataModel, DivePlotDataModel::CEILING, DivePlotDataModel::TIME, 1);
|
||||||
|
@ -345,7 +345,6 @@ void ProfileWidget2::plotDives(QList<dive*> dives)
|
||||||
}
|
}
|
||||||
|
|
||||||
diveComputerText->setText(currentdc->model);
|
diveComputerText->setText(currentdc->model);
|
||||||
diveComputerText->animateMoveTo(1 , sceneRect().height());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProfileWidget2::settingsChanged()
|
void ProfileWidget2::settingsChanged()
|
||||||
|
@ -411,8 +410,8 @@ void ProfileWidget2::mouseMoveEvent(QMouseEvent* event)
|
||||||
if (zoomLevel == 0) {
|
if (zoomLevel == 0) {
|
||||||
QGraphicsView::mouseMoveEvent(event);
|
QGraphicsView::mouseMoveEvent(event);
|
||||||
} else {
|
} else {
|
||||||
toolTipItem->setPos(mapToScene(toolTipPos));
|
|
||||||
scrollViewTo(event->pos());
|
scrollViewTo(event->pos());
|
||||||
|
toolTipItem->setPos(mapToScene(toolTipPos));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue