suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix for MacOSX when changing anti-aliasing setting

Browse Source
This commit is contained in:
wmayer 2015-03-16 23:40:27 +01:00
parent 91e3d30e5b
commit 4e41e535ff
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/DlgSettings3DViewImp.cpp
View File

@ -24,6 +24,7 @@
#include "PreCompiled.h" #include "PreCompiled.h"
#ifndef _PreComp_ #ifndef _PreComp_
# include <QApplication>
# include <QRegExp> # include <QRegExp>
# include <QMessageBox> # include <QMessageBox>
# include <memory> # include <memory>
@ -158,6 +159,7 @@ void DlgSettings3DViewImp::on_mouseButton_clicked()
void DlgSettings3DViewImp::changeEvent(QEvent *e) void DlgSettings3DViewImp::changeEvent(QEvent *e)
{ {
if (e->type() == QEvent::LanguageChange) { if (e->type() == QEvent::LanguageChange) {
comboAliasing->blockSignals(true);
int navigation = comboNavigationStyle->currentIndex(); int navigation = comboNavigationStyle->currentIndex();
int orbit = comboOrbitStyle->currentIndex(); int orbit = comboOrbitStyle->currentIndex();
int aliasing = comboAliasing->currentIndex(); int aliasing = comboAliasing->currentIndex();
@ -166,6 +168,7 @@ void DlgSettings3DViewImp::changeEvent(QEvent *e)
comboNavigationStyle->setCurrentIndex(navigation); comboNavigationStyle->setCurrentIndex(navigation);
comboOrbitStyle->setCurrentIndex(orbit); comboOrbitStyle->setCurrentIndex(orbit);
comboAliasing->setCurrentIndex(aliasing); comboAliasing->setCurrentIndex(aliasing);
comboAliasing->blockSignals(false);
} }
else { else {
QWidget::changeEvent(e); QWidget::changeEvent(e);
@ -195,14 +198,12 @@ void DlgSettings3DViewImp::onAliasingChanged(int index)
{ {
if (index < 0 || !isVisible()) if (index < 0 || !isVisible())
return; return;
// When user actively changes the setting the widget has the focus
bool active = comboAliasing->hasFocus();
// Show this message only once per application session to reduce // Show this message only once per application session to reduce
// annoyance when showing it too often. // annoyance when showing it too often.
if (active && showMsg) { if (showMsg) {
showMsg = false; showMsg = false;
QMessageBox::information(this, tr("Anti-aliasing"), QMessageBox::information(this, tr("Anti-aliasing"),
tr("Changing anti-aliasing only takes effect when creating a new viewer.")); tr("Open a new viewer or restart %1 to apply anti-aliasing changes.").arg(qApp->applicationName()));
} }
} }