[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [osx-integration/qt590-r2l] src/qmacstyle: shortcut mnemonics were left out of previous commit
From:       R.J.V. Bertin <null () kde ! org>
Date:       2017-06-29 19:25:02
Message-ID: E1dQf3m-0003Ai-D8 () code ! kde ! org
[Download RAW message or body]

Git commit 6d7c07543643b80717199e752dbc19712a969055 by R.J.V. Bertin.
Committed on 29/06/2017 at 19:24.
Pushed by rjvbb into branch 'qt590-r2l'.

shortcut mnemonics were left out of previous commit

M  +3    -3    src/qmacstyle/qmacstyle_mac.mm

https://commits.kde.org/osx-integration/6d7c07543643b80717199e752dbc19712a969055

diff --git a/src/qmacstyle/qmacstyle_mac.mm b/src/qmacstyle/qmacstyle_mac.mm
index 6469fd1..95ad17c 100644
--- a/src/qmacstyle/qmacstyle_mac.mm
+++ b/src/qmacstyle/qmacstyle_mac.mm
@@ -4567,13 +4567,13 @@ void QMacStyle::drawControl(ControlElement ce, const \
QStyleOption *opt, QPainter  p->save();
                 if (t >= 0) {
                     p->setFont(qt_app_fonts_hash()->value("QMenuItem", p->font()));
-                    int xp = contentRect.right() - tabwidth - macRightBorder
-                             - macItemHMargin - macItemFrame + 1;
                     if (opt->direction == Qt::LeftToRight) {
+                        int xp = contentRect.right() - tabwidth - macRightBorder
+                                 - macItemHMargin - macItemFrame + 1;
                         p->drawText(xp, yPos, tabwidth, contentRect.height(), \
text_flags | Qt::AlignRight,  s.mid(t + 1));
                     } else {
-                        p->drawText(xp, yPos, tabwidth, contentRect.height(), \
text_flags | Qt::AlignRight, +                        p->drawText(contentRect.x() + \
18, yPos, tabwidth, contentRect.height(), text_flags | Qt::AlignLeft,  \
LTR_OVERRIDE_CHAR + s.mid(t + 1));  }
                     s = s.left(t);


[prev in list] [next in list] [prev in thread] [next in thread]