From 867400332f97cb6a5d5532c9dd840d82d6298391 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 14 Oct 2022 17:29:59 +0300 Subject: [PATCH] Fix option Hide labels. Enabling it and the app restart hides all points. --- ChangeLog.txt | 1 + src/app/valentina/mainwindow.cpp | 1 + src/libs/vwidgets/vscenepoint.cpp | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0cafabf4f..f49eeb92a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,6 +4,7 @@ - Fix loading background image. - [smart-pattern/valentina#187] Puzzle: message "Invalid version: Max supported version 0.1.2" when opening 0.1.1 file in Val 0.7.52. - Fix export measurement separator to CSV. +- Fix option Hide labels. # Valentina 0.7.52 September 12, 2022 - Fix crash when default locale is ru. diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 6c9be123c..f09569de9 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -2973,6 +2973,7 @@ void MainWindow::ToolBarTools() }); ui->actionHideLabels->setShortcut(QKeySequence(Qt::AltModifier + Qt::Key_L)); + ui->actionHideLabels->setChecked(VAbstractValApplication::VApp()->ValentinaSettings()->GetHideLabels()); connect(ui->actionHideLabels, &QAction::triggered, this, [this](bool checked) { VAbstractValApplication::VApp()->ValentinaSettings()->SetHideLabels(checked); diff --git a/src/libs/vwidgets/vscenepoint.cpp b/src/libs/vwidgets/vscenepoint.cpp index 5c7d2aa12..483aa8b9b 100644 --- a/src/libs/vwidgets/vscenepoint.cpp +++ b/src/libs/vwidgets/vscenepoint.cpp @@ -66,6 +66,9 @@ void VScenePoint::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio { const qreal scale = SceneScale(scene()); + ScaleMainPenWidth(scale); + ScaleCircleSize(this, scale); + if (VAbstractApplication::VApp()->Settings()->GetLabelFontSize()*scale < minVisibleFontSize || VAbstractApplication::VApp()->Settings()->GetHideLabels()) { @@ -74,9 +77,6 @@ void VScenePoint::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio } else { - ScaleMainPenWidth(scale); - ScaleCircleSize(this, scale); - if (not m_onlyPoint) { m_namePoint->setVisible(m_showLabel);