kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1187 from kiwix/Issue#594-search-bar-text-align

Browse Source 
Fix Search Bar Cursor Alignment in RTL
This commit is contained in:
Kelson 2024-09-10 09:28:37 +00:00 committed by GitHub
commit f383bea78c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/searchbar.cpp
View File

@ -51,9 +51,17 @@ SearchBarLineEdit::SearchBarLineEdit(QWidget *parent) :
QLineEdit(parent), QLineEdit(parent),
m_completer(&m_completionModel, this) m_completer(&m_completionModel, this)
{ {
setAlignment(KiwixApp::isRightToLeft() ? Qt::AlignRight : Qt::AlignLeft);
mp_typingTimer = new QTimer(this); mp_typingTimer = new QTimer(this);
mp_typingTimer->setSingleShot(true); mp_typingTimer->setSingleShot(true);
setPlaceholderText(gt("search"));
/* Placeholder does not affect line edit alignment and is aligned to line
edit purely by text direction (LTR leading RTL ending). Thus, we need
directional mask to make it LTR at leading position.
https://stackoverflow.com/questions/66430215/english-and-arabic-mixed-string-not-ordered-correctly-qt
*/
const QString ltrConversionChar = QString{"\u200e"};
setPlaceholderText(ltrConversionChar + gt("search"));
setToolTip(gt("search")); setToolTip(gt("search"));
m_completer.setCompletionMode(QCompleter::UnfilteredPopupCompletion); m_completer.setCompletionMode(QCompleter::UnfilteredPopupCompletion);
m_completer.setCaseSensitivity(Qt::CaseInsensitive); m_completer.setCaseSensitivity(Qt::CaseInsensitive);
@ -77,6 +85,12 @@ SearchBarLineEdit::SearchBarLineEdit(QWidget *parent) :
if (m_returnPressed) { if (m_returnPressed) {
this->setText(m_searchbarInput); this->setText(m_searchbarInput);
} }
/* Empty text is LTR which changes the line edit alignment.
Need to explicitly align right. This is a generalized
solution that aligns text to the direction of the app. */
bool isSameDirection = text.isRightToLeft() == KiwixApp::isRightToLeft();
setAlignment(isSameDirection ? Qt::AlignLeft : Qt::AlignRight);
}); });
connect(this, &QLineEdit::returnPressed, this, [=]() { connect(this, &QLineEdit::returnPressed, this, [=]() {
m_returnPressed = true; m_returnPressed = true;