github
/
teleport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add temp file/folder to .gitignore

pull/175/head^2
Apex Liu 2019-11-16 00:48:23 +08:00
parent 5455c9ab8d
commit b8c6bbcbb1
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -105,3 +105,11 @@ profile
/server/tp_core/testssh/Debug /server/tp_core/testssh/Debug
/server/tp_core/testssh/Release /server/tp_core/testssh/Release
/client/build-tp-player-* /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

5
client/tp-player/mainwindow.cpp
View File

@ -215,7 +215,9 @@ void MainWindow::_do_update_data(UpdateData* dat) {
QPainter pp(&m_canvas); QPainter pp(&m_canvas);
for(int i = 0; i < uimgs.size(); ++i) { 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); 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; m_disable_draw = false;
setUpdatesEnabled(true); setUpdatesEnabled(true);
update();
return; return;
} }

4
client/tp-player/tp-player.pro
View File

@ -46,7 +46,7 @@ INCLUDEPATH += $$PWD/../../external/zlib/build
DEPENDPATH += $$PWD/../../external/zlib DEPENDPATH += $$PWD/../../external/zlib
DEPENDPATH += $$PWD/../../external/zlib/build 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-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 else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../external/zlib/build/debug/zlibstaticd.lib