Merge branch 'master' into pu/mp

This commit is contained in:
M. Liebmann
2017-09-21 09:07:15 +02:00
19 changed files with 236 additions and 100 deletions

View File

@@ -1646,7 +1646,7 @@ void COsdSetup::paintWindowSize(int w, int h)
{
if (win_demo == NULL) {
win_demo = new CComponentsShapeSquare(0, 0, 0, 0);
win_demo->setFrameThickness(8);
win_demo->setFrameThickness(OFFSET_INNER_MID);
win_demo->disableShadow();
win_demo->setColorBody(COL_BACKGROUND);
win_demo->setColorFrame(COL_RED);