# HG changeset patch # User Santeri Piippo # Date 1371335959 -10800 # Node ID d544de09c93bd7e259661ae76482174d6b77d703 # Parent a91fa09d686c3091335b649d62367b479665e759 Use a more greenish green rather than yellowish lime, added some constraints to when double-clicking in the viewport should edit the given object to prevent unwanted popups diff -r a91fa09d686c -r d544de09c93b changelog.txt --- a/changelog.txt Sun Jun 16 00:58:20 2013 +0300 +++ b/changelog.txt Sun Jun 16 01:39:19 2013 +0300 @@ -20,6 +20,7 @@ button from the LDraw path config dialog, it's no longer needed. - Fixed: Coordinates weren't drawn properly on a bright background (was always drawn in bright colors..). - Renamed "Set Contents" into "Edit LDraw Code", should be clearer +- Changed the green color to more "greener" green, rather than yellowish lime. - The dialog box for setting a comment's text is now a lot wider - Calculated coordinates are now rounded down (to prevent stuff like Z:160.000001) - New part dialog: changed "Name:" to "Title", widened a tad. \ No newline at end of file diff -r a91fa09d686c -r d544de09c93b src/gldraw.cpp --- a/src/gldraw.cpp Sun Jun 16 00:58:20 2013 +0300 +++ b/src/gldraw.cpp Sun Jun 16 01:39:19 2013 +0300 @@ -244,7 +244,7 @@ obj->getType () != LDObject::CondLine) { if (list == GL::BFCFrontList) - qcol = QColor (80, 192, 0); + qcol = QColor (40, 192, 0); else qcol = QColor (224, 0, 0); } else { @@ -551,14 +551,14 @@ pen.setWidth (2); pen.setColor (luma (m_bgcolor) < 40 ? Qt::white : Qt::black); paint.setPen (pen); - paint.setBrush (QColor (128, 192, 0, 128)); + paint.setBrush (QColor (64, 192, 0, 128)); paint.drawPolygon (poly, numverts); // Draw vertex blips pen = m_thinBorderPen; pen.setWidth (1); paint.setPen (pen); - paint.setBrush (QColor (128, 192, 0)); + paint.setBrush (QColor (64, 192, 0)); for (ushort i = 0; i < numverts; ++i) { QPoint& blip = poly[i]; @@ -643,7 +643,7 @@ y1 = m_pos.y (); QRect rect (x0, y0, x1 - x0, y1 - y0); - QColor fillColor = (m_addpick ? "#80FF00" : "#00CCFF"); + QColor fillColor = (m_addpick ? "#40FF00" : "#00CCFF"); fillColor.setAlphaF (0.2f); paint.setPen (m_thickBorderPen); @@ -1579,6 +1579,9 @@ } void GLRenderer::mouseDoubleClickEvent (QMouseEvent* ev) { + if (!(ev->buttons () & Qt::LeftButton) || editMode () != Select) + return; + pick (ev->x (), ev->y ()); if (g_win->sel ().size () == 0)