kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-13 21:57:40 +03:00
Code Issues Projects Releases Wiki Activity

viewsdialog:specify maxiconsize for dropdown screens

Browse Source
This commit is contained in:
Michail Vourlakos 2021-05-01 10:06:11 +03:00
parent 73382d4d04
commit b22ead393e
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/settings/generic/generictools.cpp
View File

@ -347,9 +347,11 @@ void drawChangesIndicator(QPainter *painter, const QStyleOptionViewItem &option)
painter->restore();
}
int screenMaxLength(const QStyleOption &option)
int screenMaxLength(const QStyleOption &option, const int &maxIconSize)
{
int scr_maxlength = option.rect.height() * 1.7;
int icon_length = maxIconSize >= 0 ? qMin(option.rect.height(), maxIconSize) : option.rect.height();
int scr_maxlength = icon_length * 1.7;
//! provide odd screen_maxlength
if (scr_maxlength % 2 == 0) {
@ -359,9 +361,9 @@ int screenMaxLength(const QStyleOption &option)
return scr_maxlength;
}
QRect remainedFromScreenDrawing(const QStyleOption &option)
QRect remainedFromScreenDrawing(const QStyleOption &option, const int &maxIconSize)
{
int total_length = screenMaxLength(option) + MARGIN * 2 + 1;
int total_length = screenMaxLength(option, maxIconSize) + MARGIN * 2 + 1;
QRect optionRemainedRect = (qApp->layoutDirection() == Qt::RightToLeft) ? QRect(option.rect.x(), option.rect.y(), option.rect.width() - total_length, option.rect.height()) :
QRect(option.rect.x() + total_length, option.rect.y(), option.rect.width() - total_length, option.rect.height());
@ -369,9 +371,9 @@ QRect remainedFromScreenDrawing(const QStyleOption &option)
return optionRemainedRect;
}
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionViewItem &option)
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionViewItem &option, const int &maxIconSize)
{
int total_length = screenMaxLength(option) + MARGIN * 2 + 1;
int total_length = screenMaxLength(option, maxIconSize) + MARGIN * 2 + 1;
QStyleOptionViewItem screenOption = option;
screenOption.text = "";
@ -387,9 +389,9 @@ void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOp
style->drawControl(QStyle::CE_ItemViewItem, &screenOption, painter);
}
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionMenuItem &option)
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionMenuItem &option, const int &maxIconSize)
{
int total_length = screenMaxLength(option) + MARGIN * 2 + 1;
int total_length = screenMaxLength(option, maxIconSize) + MARGIN * 2 + 1;
QStyleOptionMenuItem screenOption = option;
screenOption.text = "";
@ -405,13 +407,13 @@ void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOp
style->drawControl(QStyle::CE_MenuItem, &screenOption, painter);
}
QRect drawScreen(QPainter *painter, const QStyleOption &option, QRect screenGeometry, const float brushOpacity)
QRect drawScreen(QPainter *painter, const QStyleOption &option, QRect screenGeometry, const int &maxIconSize, const float brushOpacity)
{
float scr_ratio = (float)screenGeometry.width() / (float)screenGeometry.height();
bool isVertical = (scr_ratio < 1.0);
int scr_maxlength = screenMaxLength(option);
int scr_maxthickness = option.rect.height() - MARGIN * 2;
int scr_maxlength = screenMaxLength(option, maxIconSize);
int scr_maxthickness = maxIconSize >= 0 ? qMin(maxIconSize, option.rect.height() - MARGIN * 2) : option.rect.height() - MARGIN * 2;
int total_length = scr_maxlength + MARGIN * 2;
int pen_width = 2;
@ -419,9 +421,9 @@ QRect drawScreen(QPainter *painter, const QStyleOption &option, QRect screenGeom
painter->save();
painter->setRenderHint(QPainter::Antialiasing, true);
float scr_maxratio = ((float)scr_maxlength) / (float)(scr_maxthickness - 2*MARGIN);
float scr_maxratio = ((float)scr_maxlength) / (float)(scr_maxthickness);
scr_ratio = qMin(qMax((float)0.75, scr_ratio), (float)scr_maxratio);
int scr_height = (!isVertical ? option.rect.height() - MARGIN * 6 : option.rect.height() - MARGIN * 4);
int scr_height = (!isVertical ? scr_maxthickness - MARGIN * 4 : scr_maxthickness - MARGIN * 2);
int scr_width = scr_ratio * scr_height;
//! provide even screen width and height
@ -434,9 +436,11 @@ QRect drawScreen(QPainter *painter, const QStyleOption &option, QRect screenGeom
scr_height++;
}
int topmargin = (option.rect.height() - scr_maxthickness) / 2;
QRect screenMaximumRect = (qApp->layoutDirection() == Qt::RightToLeft) ?
QRect(option.rect.x() + option.rect.width() - scr_maxlength - MARGIN, option.rect.y() + MARGIN, scr_maxlength, scr_maxthickness - 1) :
QRect(option.rect.x() + MARGIN , option.rect.y() + MARGIN, scr_maxlength, scr_maxthickness - 1);
QRect(option.rect.x() + option.rect.width() - scr_maxlength - MARGIN, option.rect.y() + topmargin, scr_maxlength, scr_maxthickness - 1) :
QRect(option.rect.x() + MARGIN , option.rect.y() + topmargin, scr_maxlength, scr_maxthickness - 1);
int topScreenMargin = (screenMaximumRect.height() - scr_height) / 2;
int leftScreenMargin = (screenMaximumRect.width() - scr_width) / 2;

10
app/settings/generic/generictools.h
View File

@ -63,13 +63,13 @@ void drawChangesIndicator(QPainter *painter, const QStyleOptionViewItem &option)
//! screen icon
QRect remainedFromScreenDrawing(const QStyleOption &option);
QRect drawScreen(QPainter *painter, const QStyleOption &option, QRect screenGeometry, const float brushOpacity = 1.0); // returns screen available rect
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionViewItem &option);
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionMenuItem &option);
QRect remainedFromScreenDrawing(const QStyleOption &option, const int &maxIconSize = -1);
QRect drawScreen(QPainter *painter, const QStyleOption &option, QRect screenGeometry, const int &maxIconSize = -1, const float brushOpacity = 1.0); // returns screen available rect
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionViewItem &option, const int &maxIconSize = -1);
void drawScreenBackground(QPainter *painter, const QStyle *style, const QStyleOptionMenuItem &option, const int &maxIconSize = -1);
void drawView(QPainter *painter, const QStyleOption &option, const Latte::Data::View &view, const QRect &availableScreenRect, const float brushOpacity = 1.0);
int screenMaxLength(const QStyleOption &option);
int screenMaxLength(const QStyleOption &option, const int &maxIconSize = -1);
}

7
app/settings/viewsdialog/delegates/custommenuitemwidget.cpp
View File

@ -84,9 +84,10 @@ void CustomMenuItemWidget::paintEvent(QPaintEvent* e)
opt.rect = remained;
if (!m_screen.id.isEmpty()) {
remained = Latte::remainedFromScreenDrawing(opt);
Latte::drawScreenBackground(&painter, style(), opt);
QRect availableScreenRect = Latte::drawScreen(&painter, opt, m_screen.geometry);
int maxiconsize = 26;
remained = Latte::remainedFromScreenDrawing(opt, maxiconsize);
Latte::drawScreenBackground(&painter, style(), opt, maxiconsize);
QRect availableScreenRect = Latte::drawScreen(&painter, opt, m_screen.geometry, maxiconsize);
if (!m_view.id.isEmpty()) {
Latte::drawView(&painter, opt, m_view, availableScreenRect);

8
app/settings/viewsdialog/delegates/namedelegate.cpp
View File

@ -87,10 +87,10 @@ void NameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
myOptions.rect = availableTextRect;
availableTextRect = Latte::remainedFromScreenDrawing(myOptions);
Latte::drawScreenBackground(painter, option.widget->style(), myOptions);
QRect availableScreenRect = Latte::drawScreen(painter, myOptions, screen.geometry, textopacity);
int maxiconsize = -1; //disabled
availableTextRect = Latte::remainedFromScreenDrawing(myOptions, maxiconsize);
Latte::drawScreenBackground(painter, option.widget->style(), myOptions, maxiconsize);
QRect availableScreenRect = Latte::drawScreen(painter, myOptions, screen.geometry, maxiconsize, textopacity);
Latte::drawView(painter, myOptions, view, availableScreenRect, textopacity);
myOptions.rect = availableTextRect;