luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Separator: Do not use widget theme for drawing.

Browse source 
[GB.QT4]
* NEW: Separator: Do not use widget theme for drawing.
* OPT: Showing a control with Ignore property set does not trigger a parent arrangement anymore.

[GB.QT5]
* NEW: Separator: Do not use widget theme for drawing.
* OPT: Showing a control with Ignore property set does not trigger a parent arrangement anymore.
This commit is contained in:
gambas 2020-10-10 14:55:55 +02:00
parent 834ad5d882
commit 75f5a6f907
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gb.qt4/src/CLabel.cpp
View file

@ -416,21 +416,19 @@ MySeparator::MySeparator(QWidget *parent)
void MySeparator::paintEvent( QPaintEvent * )
{
void *_object = CWidget::getReal(this);
QPainter p(this);
uint color = CWIDGET_get_foreground(&THIS->widget);
QColor pen = (color == COLOR_DEFAULT) ? CCOLOR_light_foreground() : TO_QCOLOR(color);
if (width() == 1 || height() == 1)
{
void *_object = CWidget::getReal(this);
uint color = CWIDGET_get_foreground(&THIS->widget);
p.setPen(color == COLOR_DEFAULT ? CCOLOR_light_foreground() : TO_QCOLOR(color));
if (width() >= height())
p.drawLine(0, height() / 2, width() - 1, height() / 2);
else
p.drawLine(width() / 2, 0, width() / 2, height() - 1);
p.fillRect(0, 0, width(), height(), pen);
}
else
{
QStyleOption opt;
/*QStyleOption opt;
opt.rect = rect();
opt.palette = palette();
@ -439,7 +437,19 @@ void MySeparator::paintEvent( QPaintEvent * )
if (width() < height())
opt.state |= QStyle::State_Horizontal;
style()->drawPrimitive(QStyle::PE_IndicatorToolBarSeparator, &opt, &p);
style()->drawPrimitive(QStyle::PE_IndicatorToolBarSeparator, &opt, &p);*/
int d = 2 + MAIN_scale / 2;
if (height() >= width())
{
if (height() > d)
p.fillRect(width() / 2, d / 2, 1, height() - d, pen);
}
else if (width() > d)
{
p.fillRect(d / 2, height() / 2, width() - d, 1, pen);
}
}
}

2
gb.qt4/src/CWidget.cpp
View file

@ -1166,7 +1166,7 @@ void CWIDGET_set_visible(CWIDGET *_object, bool v)
QWIDGET(_object)->hide();
}
if (arrange)
if (arrange && !THIS->flag.ignore)
arrange_parent(THIS);
}