github-code/QWidgetDemo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改进部分代码

Browse Source
This commit is contained in:
feiyangqingyun
2021-03-29 09:37:40 +08:00
parent 6bfe5a331a
commit 7c1b12f7ce
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
QWidgetDemo.pro
View File

@@ -34,7 +34,7 @@ SUBDIRS += videowidget #通用视频控件
SUBDIRS += screenwidget #屏幕截图控件 SUBDIRS += screenwidget #屏幕截图控件
SUBDIRS += imageswitch #图片开关控件 SUBDIRS += imageswitch #图片开关控件
SUBDIRS += netserver #网络中转服务器 SUBDIRS += netserver #网络中转服务器
SUBDIRS += base64 #图片文字base64互换 SUBDIRS += base64 #图片文字base64互换
SUBDIRS += smoothcurve #平滑曲线 SUBDIRS += smoothcurve #平滑曲线
win32 { win32 {

2
nettool/head.h
View File

@@ -4,8 +4,10 @@
#if (QT_VERSION > QT_VERSION_CHECK(5,0,0)) #if (QT_VERSION > QT_VERSION_CHECK(5,0,0))
#include <QtWidgets> #include <QtWidgets>
#ifdef websocket
#include <QtWebSockets> #include <QtWebSockets>
#endif #endif
#endif
#include "app.h" #include "app.h"

4
videowidget/videowidget.cpp
View File

@@ -274,7 +274,9 @@ void VideoWidget::drawBorder(QPainter *painter)
void VideoWidget::drawBg(QPainter *painter) void VideoWidget::drawBg(QPainter *painter)
{ {
painter->save(); painter->save();
painter->fillRect(rect(), bgColor); if (bgColor != Qt::transparent) {
painter->fillRect(rect(), bgColor);
}
//背景图片为空则绘制文字,否则绘制背景图片 //背景图片为空则绘制文字,否则绘制背景图片
if (bgImage.isNull()) { if (bgImage.isNull()) {