summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/editor.cc2
-rw-r--r--src/value.cc7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/editor.cc b/src/editor.cc
index bba8d4f..92aeefe 100644
--- a/src/editor.cc
+++ b/src/editor.cc
@@ -104,6 +104,8 @@ void Editor::wheelEvent ( QWheelEvent * event )
zoomIn();
else if (event->delta() < 0 )
zoomOut();
+ } else {
+ QTextEdit::wheelEvent( event );
}
}
diff --git a/src/value.cc b/src/value.cc
index 666062a..3b7f357 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -198,7 +198,12 @@ public:
}
return tmpstr;
#else
- return boost::lexical_cast<std::string>(op1);
+ // attempt to emulate Qt's QString.sprintf("%g"); from old OpenSCAD.
+ // see https://github.com/openscad/openscad/issues/158
+ std::stringstream tmp;
+ tmp.unsetf(std::ios::floatfield);
+ tmp << op1;
+ return tmp.str();
#endif
}
contact: Jan Huwald // Impressum