Let getPosNearX take horizontal scrolling into account

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 2b639a926ca4fa8d7b6eb561824e35f1de870133..c31c7fac779f7173b512d7672d23924277332fee 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -114,7 +114,7 @@ public:
                if (noun_ == FONT_ON)
                        return SMALLCAPS_SHAPE;
                if (emph_ == FONT_ON)
-                       return (shape_ == UP_SHAPE) ? ITALIC_SHAPE : UP_SHAPE;
+                       return (shape_ == ITALIC_SHAPE) ? UP_SHAPE : ITALIC_SHAPE;
                return shape_;
        }