Subversion Repositories tpanel

Rev

Rev 436 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 436 Rev 437
Line 3417... Line 3417...
3417 
 */
 3417 
 */
3418 
void MainWindow::repaintObjects()
 3418 
void MainWindow::repaintObjects()
3419 
{
 3419 
{
3420 
    DECL_TRACER("MainWindow::repaintObjects()");
 3420 
    DECL_TRACER("MainWindow::repaintObjects()");
3421 
 
 3421 
 
- 
 
 3422 
    if (mRunRedraw)
3422 
    TObject::OBJECT_t *obj = getFirstDirty();
 3423 
        return;
3423 
 
 3424 
 
- 
 
 3425 
    std::thread thr = std::thread([=] {
3424 
    while (obj)
 3426 
        mRunRedraw = true;
- 
 
 3427 
        TObject::OBJECT_t *obj = getFirstDirty();
3425 
    {
 3428 
 
3426 
        if (!obj->remove && !obj->invalid && obj->dirty)
 3429 
        while (obj)
3427 
        {
 3430 
        {
- 
 
 3431 
            if (!obj->remove && !obj->invalid && obj->dirty)
- 
 
 3432 
            {
3428 
            MSG_PROTOCOL("Refreshing widget " << handleToString (obj->handle));
 3433 
                MSG_PROTOCOL("Refreshing widget " << handleToString (obj->handle));
3429 
 
 3434 
 
3430 
            if (gPageManager)
 3435 
                if (gPageManager)
3431 
                gPageManager->redrawObject(obj->handle);
 3436 
                    gPageManager->redrawObject(obj->handle);
3432 
 
 3437 
 
3433 
            obj->dirty = false;
 3438 
                obj->dirty = false;
- 
 
 3439 
            }
- 
 
 3440 
 
- 
 
 3441 
            obj = getNextDirty(obj);
3434 
        }
 3442 
        }
3435 
 
 3443 
 
3436 
        obj = getNextDirty(obj);
 3444 
        mRunRedraw = false;
3437 
    }
 3445 
    });
- 
 
 3446 
 
- 
 
 3447 
    thr.detach();
3438 
}
 3448 
}
3439 
 
 3449 
 
3440 
void MainWindow::refresh(ulong handle)
 3450 
void MainWindow::refresh(ulong handle)
3441 
{
 3451 
{
3442 
    DECL_TRACER("MainWindow::refresh(ulong handle)");
 3452 
    DECL_TRACER("MainWindow::refresh(ulong handle)");
Line 5444... Line 5454...
5444 
        else if (isScaled())
 5454 
        else if (isScaled())
5445 
            pix.convertFromImage(img.scaled(scale(width), scale(height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 5455 
            pix.convertFromImage(img.scaled(scale(width), scale(height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
5446 
        else
 5456 
        else
5447 
            pix.convertFromImage(img);
 5457 
            pix.convertFromImage(img);
5448 
 
 5458 
 
5449 
//        nobj.object.plaintext->setBgPixmap(pix);
 - 
 
5450 
        nobj.object.plaintext->setBackgroundPixmap(pix);
 5459 
        nobj.object.plaintext->setBackgroundPixmap(pix);
5451 
        // Load the font
 5460 
        // Load the font
5452 
        QFont font = loadFont(button->getFontIndex(button->getActiveInstance()), button->getFont(), button->getFontStyle());
 5461 
        QFont font = loadFont(button->getFontIndex(button->getActiveInstance()), button->getFont(), button->getFontStyle());
5453 
 
 5462 
 
5454 
        if (gPageManager && gPageManager->isSetupActive())
 5463 
        if (gPageManager && gPageManager->isSetupActive())
Line 5463... Line 5472...
5463 
        QColor txcolor(QColor::fromRgba(qRgba(textColor.red, textColor.green, textColor.blue, textColor.alpha)));
 5472 
        QColor txcolor(QColor::fromRgba(qRgba(textColor.red, textColor.green, textColor.blue, textColor.alpha)));
5464 
        QColor cfcolor(QColor::fromRgba(qRgba(fillColor.red, fillColor.green, fillColor.blue, fillColor.alpha)));
 5473 
        QColor cfcolor(QColor::fromRgba(qRgba(fillColor.red, fillColor.green, fillColor.blue, fillColor.alpha)));
5465 
        palette.setColor(QPalette::Window, cfcolor);
 5474 
        palette.setColor(QPalette::Window, cfcolor);
5466 
        palette.setColor(QPalette::Base, cfcolor);
 5475 
        palette.setColor(QPalette::Base, cfcolor);
5467 
        palette.setColor(QPalette::Text, txcolor);
 5476 
        palette.setColor(QPalette::Text, txcolor);
5468 
//        palette.setBrush(QPalette::Window, QBrush(pix));
 - 
 
5469 
 
 5477 
 
5470 
        nobj.object.plaintext->setFont(font);
 5478 
        nobj.object.plaintext->setFont(font);
5471 
        nobj.object.plaintext->setPalette(palette);
 5479 
        nobj.object.plaintext->setPalette(palette);
5472 
        nobj.object.plaintext->setTextColor(txcolor);
 5480 
        nobj.object.plaintext->setTextColor(txcolor);
5473 
 
 5481