Renamed "Outline thin strokes" to "visible hairlines" to make the intent clearer.

5 files changed, 26 insertions, 25 deletions

diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index c2208d161..05123297e 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -186,13 +186,13 @@ DrawingShape::_renderStroke(DrawingContext &dc)
         }
         _nrstyle.applyStroke(dc);
 
-        // Special handling for thin outline mode when we're drawing lines smaller than half a
-        // pixel
-        if (_drawing.outlineThin()) {
-            double outline_thin_size = 0.5, trash = 0.5;
-            dc.device_to_user_distance(outline_thin_size, trash);
-            if (_nrstyle.stroke_width < outline_thin_size) {
-                dc.setLineWidth(outline_thin_size);
+        // If the draw mode is set to visible hairlines, don't let them get smaller than half a
+        // pixel.
+        if (_drawing.visibleHairlines()) {
+            double half_pixel_size = 0.5, trash = 0.5;
+            dc.device_to_user_distance(half_pixel_size, trash);
+            if (_nrstyle.stroke_width < half_pixel_size) {
+                dc.setLineWidth(half_pixel_size);
             }
         }
 
@@ -267,13 +267,13 @@ DrawingShape::_renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigne
                 if (has_stroke) {
                     _nrstyle.applyStroke(dc);
 
-                    // Special handling for thin outline mode when we're drawing lines smaller than
-                    // half a pixel
-                    if (_drawing.outlineThin()) {
-                        double outline_thin_size = 0.5, trash = 0.5;
-                        dc.device_to_user_distance(outline_thin_size, trash);
-                        if (_nrstyle.stroke_width < outline_thin_size) {
-                            dc.setLineWidth(outline_thin_size);
+                    // If the draw mode is set to visible hairlines, don't let anything get smaller
+                    // than half a pixel.
+                    if (_drawing.visibleHairlines()) {
+                        double half_pixel_size = 0.5, trash = 0.5;
+                        dc.device_to_user_distance(half_pixel_size, trash);
+                        if (_nrstyle.stroke_width < half_pixel_size) {
+                            dc.setLineWidth(half_pixel_size);
                         }
                     }
 
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index b48ce7d31..d823012e3 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -604,12 +604,13 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are
             if (has_stroke) {
                 _nrstyle.applyStroke(dc);
 
-                // Special handling for thin outline mode when we're drawing lines smaller than half a pixel
-                if (_drawing.outlineThin()) {
-                    double outline_thin_size = 0.5, trash = 0.5;
-                    dc.device_to_user_distance(outline_thin_size, trash);
-                    if (_nrstyle.stroke_width < outline_thin_size) {
-                        dc.setLineWidth(outline_thin_size);
+                // If the draw mode is set to visible hairlines, don't let anything get smaller
+                // than half a pixel.
+                if (_drawing.visibleHairlines()) {
+                    double half_pixel_size = 0.5, trash = 0.5;
+                    dc.device_to_user_distance(half_pixel_size, trash);
+                    if (_nrstyle.stroke_width < half_pixel_size) {
+                        dc.setLineWidth(half_pixel_size);
                     }
                 }
 
diff --git a/src/display/drawing.cpp b/src/display/drawing.cpp
index 7ecaea987..4b2a2cadf 100644
--- a/src/display/drawing.cpp
+++ b/src/display/drawing.cpp
@@ -79,14 +79,14 @@ Drawing::outline() const
     return renderMode() == RENDERMODE_OUTLINE;
 }
 bool
-Drawing::outlineThin() const
+Drawing::visibleHairlines() const
 {
-    return renderMode() == RENDERMODE_OUTLINE_THIN;
+    return renderMode() == RENDERMODE_VISIBLE_HAIRLINES;
 }
 bool
 Drawing::renderFilters() const
 {
-    return renderMode() == RENDERMODE_NORMAL || renderMode() == RENDERMODE_OUTLINE_THIN;
+    return renderMode() == RENDERMODE_NORMAL || renderMode() == RENDERMODE_VISIBLE_HAIRLINES;
 }
 int
 Drawing::blurQuality() const
diff --git a/src/display/drawing.h b/src/display/drawing.h
index 1669cc3a4..931fe8e46 100644
--- a/src/display/drawing.h
+++ b/src/display/drawing.h
@@ -50,7 +50,7 @@ public:
     RenderMode renderMode() const;
     ColorMode colorMode() const;
     bool outline() const;
-    bool outlineThin() const;
+    bool visibleHairlines() const;
     bool renderFilters() const;
     int blurQuality() const;
     int filterQuality() const;
diff --git a/src/display/rendermode.h b/src/display/rendermode.h
index 36dd0ead3..80e6da2dd 100644
--- a/src/display/rendermode.h
+++ b/src/display/rendermode.h
@@ -13,7 +13,7 @@ enum RenderMode {
     RENDERMODE_NORMAL,
     RENDERMODE_NO_FILTERS,
     RENDERMODE_OUTLINE,
-    RENDERMODE_OUTLINE_THIN
+    RENDERMODE_VISIBLE_HAIRLINES
 };
 
 enum ColorMode {