diff --git a/.gitignore b/.gitignore index a0677f0..badc925 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,11 @@ profile /server/tp_core/testssh/Debug /server/tp_core/testssh/Release /client/build-tp-player-* +/client/tp-player/debug +/client/tp-player/release +/external/zlib +/client/tp-player/.qmake.stash +/client/tp-player/Makefile +/client/tp-player/Makefile.Debug +/client/tp-player/Makefile.Release +/client/tp-player/ui_mainwindow.h diff --git a/client/tp-player/mainwindow.cpp b/client/tp-player/mainwindow.cpp index bc3b43c..2e2e458 100644 --- a/client/tp-player/mainwindow.cpp +++ b/client/tp-player/mainwindow.cpp @@ -215,7 +215,9 @@ void MainWindow::_do_update_data(UpdateData* dat) { QPainter pp(&m_canvas); for(int i = 0; i < uimgs.size(); ++i) { pp.drawImage(uimgs[i].x, uimgs[i].y, *(uimgs[i].img), 0, 0, uimgs[i].w, uimgs[i].h, Qt::AutoColor); - update(uimgs[i].x, uimgs[i].y, uimgs[i].w, uimgs[i].h); + + if(!m_disable_draw) + update(uimgs[i].x, uimgs[i].y, uimgs[i].w, uimgs[i].h); } @@ -243,6 +245,7 @@ void MainWindow::_do_update_data(UpdateData* dat) { // 允许界面更新 m_disable_draw = false; setUpdatesEnabled(true); + update(); return; } diff --git a/client/tp-player/tp-player.pro b/client/tp-player/tp-player.pro index c72fee9..32e3a82 100644 --- a/client/tp-player/tp-player.pro +++ b/client/tp-player/tp-player.pro @@ -46,7 +46,7 @@ INCLUDEPATH += $$PWD/../../external/zlib/build DEPENDPATH += $$PWD/../../external/zlib DEPENDPATH += $$PWD/../../external/zlib/build -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../external/zlib/build/release/libzlibstaticd.a +win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../external/zlib/build/release/libzlibstatic.a else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../external/zlib/build/debug/libzlibstaticd.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../external/zlib/build/release/zlibstaticd.lib +else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../external/zlib/build/release/zlibstatic.lib else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../external/zlib/build/debug/zlibstaticd.lib