github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

RTL fixes in settings windows

Browse Source
pull/2/head
Michail Vourlakos 7 years ago
parent e653fd1666
commit 55c373a9e1
4 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File

14
app/layoutsDelegates/activitycmbboxdelegate.cpp
Unescape Escape View File

@ -127,6 +127,7 @@ void ActivityCmbBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem
QTextDocument doc;
QString css;
QString activitiesText = myOptions.text;
QBrush nBrush;
@ -137,6 +138,7 @@ void ActivityCmbBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem
}
css = QString("body { color : %1; }").arg(nBrush.color().name());
doc.setDefaultStyleSheet(css);
doc.setHtml("<body>" + myOptions.text + "</body>");
@ -144,11 +146,17 @@ void ActivityCmbBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem
myOptions.widget->style()->drawControl(QStyle::CE_ItemViewItem, &myOptions, painter);
//we need an offset to be in the same vertical center of TextEdit
int offsetY = 1 + (myOptions.rect.height() - doc.size().height()) / 2;
int offsetY = ((myOptions.rect.height() - doc.size().height()) / 2);
painter->translate(myOptions.rect.left(), myOptions.rect.top() + offsetY);
QRect clip(0, 0, myOptions.rect.width(), myOptions.rect.height());
if ((qApp->layoutDirection() == Qt::RightToLeft) && !activitiesText.isEmpty()) {
int textWidth = doc.size().width();
painter->translate(qMax(myOptions.rect.left(), myOptions.rect.right() - textWidth), myOptions.rect.top() + offsetY + 1);
} else {
painter->translate(myOptions.rect.left(), myOptions.rect.top() + offsetY + 1);
}
QRect clip(0, 0, myOptions.rect.width(), myOptions.rect.height());
doc.drawContents(painter, clip);
} else {
QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &myOptions, painter);

14
app/layoutsDelegates/layoutnamedelegate.cpp
Unescape Escape View File

@ -47,10 +47,11 @@ void LayoutNameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
QFontMetrics fm(option.font);
int textWidth = fm.width(nameText);
int thick = option.rect.height();
int startWidth = qBound(0, option.rect.width() - textWidth - thick , thick);
int startWidth = (qApp->layoutDirection() == Qt::RightToLeft) ? thick : qBound(0, option.rect.width() - textWidth - thick , thick);
int endWidth = (qApp->layoutDirection() == Qt::RightToLeft) ? qBound(0, option.rect.width() - textWidth - thick , thick) : thick;
QRect destinationS(option.rect.x(), option.rect.y(), startWidth, thick);
QRect destinationE(option.rect.x() + option.rect.width() - thick, option.rect.y(), thick, thick);
QRect destinationE(option.rect.x() + option.rect.width() - thick, option.rect.y(), endWidth, thick);
QStyleOptionViewItem myOptionS = option;
QStyleOptionViewItem myOptionE = option;
@ -58,7 +59,7 @@ void LayoutNameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
myOptionS.rect = destinationS;
myOptionE.rect = destinationE;
myOptionMain.rect.setX(option.rect.x() + startWidth);
myOptionMain.rect.setWidth(option.rect.width() - startWidth - thick);
myOptionMain.rect.setWidth(option.rect.width() - startWidth - endWidth);
QStyledItemDelegate::paint(painter, myOptionMain, index);
@ -73,7 +74,12 @@ void LayoutNameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
//! Lock Icon 2: QIcon attempt that doesnt change color
QIcon lockIcon = QIcon::fromTheme("object-locked");
painter->drawPixmap(destinationE, lockIcon.pixmap(thick, thick));
if (qApp->layoutDirection() == Qt::RightToLeft) {
painter->drawPixmap(destinationS, lockIcon.pixmap(thick, thick));
} else {
painter->drawPixmap(destinationE, lockIcon.pixmap(thick, thick));
}
//! Lock Icon 3: QIcon and change colors attempt
/*QIcon lockIcon = QIcon::fromTheme("object-locked");

7
app/settingsdialog.cpp
Unescape Escape View File

@ -151,6 +151,13 @@ SettingsDialog::SettingsDialog(QWidget *parent, DockCorona *corona)
QAction *aboutAction = helpMenu->addAction(i18n("About Latte"));
aboutAction->setIcon(QIcon::fromTheme("latte-dock"));
//! RTL support for labels in preferences
if (qApp->layoutDirection() == Qt::RightToLeft) {
ui->behaviorLbl->setAlignment(Qt::AlignRight | Qt::AlignTop);
ui->mouseSensetivityLbl->setAlignment(Qt::AlignRight | Qt::AlignTop);
ui->delayLbl->setAlignment(Qt::AlignRight | Qt::AlignTop);
}
loadSettings();
//! SIGNALS

9
shell/package/contents/configuration/BehaviorConfig.qml
Unescape Escape View File

@ -465,7 +465,8 @@ PlasmaComponents.Page {
PlasmaComponents.Label {
Layout.fillWidth: false
Layout.rightMargin: units.smallSpacing
Layout.rightMargin: Qt.application.layoutDirection === Qt.RightToLeft ? 0 : units.smallSpacing
Layout.leftMargin: Qt.application.layoutDirection === Qt.RightToLeft ? units.smallSpacing : 0
horizontalAlignment: Text.AlignRight
text: i18n("Show")
}
@ -480,8 +481,10 @@ PlasmaComponents.Page {
PlasmaComponents.Label {
Layout.fillWidth: false
Layout.leftMargin: units.largeSpacing
Layout.rightMargin: units.smallSpacing
Layout.leftMargin: Qt.application.layoutDirection === Qt.RightToLeft ?
units.smallSpacing : units.largeSpacing
Layout.rightMargin: Qt.application.layoutDirection === Qt.RightToLeft ?
units.largeSpacing : units.smallSpacing
horizontalAlignment: Text.AlignRight
text: i18n("Hide")
}

Write Preview
Loading…
Cancel
Save