diff --git a/Qss.cpp b/Qss.cpp index 991d43a..9e8daad 100644 --- a/Qss.cpp +++ b/Qss.cpp @@ -53,25 +53,27 @@ QssTtitleBar::QssTtitleBar(QWidget *parent , m_titlebarTitle = new QLabel(this);// m_titlebarTitle->setObjectName("titlebartitle");//css - m_titlebarTitle->setStyleSheet("color: white;margin-left:4px;font-size:15px;"); + m_titlebarTitle->setStyleSheet("color: white;"); + m_titlebarTitle->setFont(QFont("微软雅黑", 16)); QHBoxLayout* hBox = new QHBoxLayout(this); hBox->setMargin(0); hBox->addWidget(m_iconBtn); + hBox->addStretch(20); hBox->addWidget(m_titlebarTitle); - hBox->addStretch(1); + hBox->addStretch(19); hBox->addWidget(m_minBtn); hBox->addWidget(m_restoreBtn); - m_restoreBtn->setVisible(m_maxOrRestore);// + m_restoreBtn->setVisible(m_maxOrRestore); hBox->addWidget(m_maxBtn); hBox->addWidget(m_closeBtn); hBox->setSpacing(0); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);// + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - connect(m_closeBtn, SIGNAL(clicked()), parent, SLOT(close()));// + connect(m_closeBtn, SIGNAL(clicked()), parent, SLOT(close())); connect(m_minBtn, SIGNAL(clicked()), parent, SLOT(showMinimized())); - connect(m_maxBtn, SIGNAL(clicked()), this, SLOT(onMaxOrRestore()));// + connect(m_maxBtn, SIGNAL(clicked()), this, SLOT(onMaxOrRestore())); connect(m_restoreBtn, SIGNAL(clicked()), this, SLOT(onMaxOrRestore())); m_iconBtn->installEventFilter(this);//m_iconLab @@ -83,6 +85,7 @@ QssTtitleBar::QssTtitleBar(QWidget *parent , Qt::MSWindowsFixedSizeDialogHint); this->setGeometry(parent->geometry().x(),parent->geometry().y(),0,0); m_rcNormal = parentWidget()->geometry(); + this->setStyleSheet("font-size:30px;"); } QssTtitleBar::~QssTtitleBar() @@ -145,7 +148,6 @@ void QssTtitleBar::mouseMoveEvent( QMouseEvent * ev ) QPoint globalPt = ev->globalPos(); QPoint movePt = globalPt - m_pressedPos;//FrameglobalPos parentWidget()->move(movePt);//globalPos - qDebug()<geometry()<objectName()<objectName(); parentWidget()->setGeometry(rc); rc.setRight(rc.right() - 50); @@ -236,6 +236,7 @@ void QssMainWindow::OnMaxOrRestore(bool max) QssMainWindow::QssMainWindow(QWidget *parent/* = 0*/, Qt::WindowFlags flags/* = 0*/,float scale) : QMainWindow(parent, flags), + ICallDPIChanged(), m_mousePressedInBoundy(false), m_bLeftPress(false) { @@ -259,7 +260,6 @@ QssMainWindow::QssMainWindow(QWidget *parent/* = 0*/, Qt::WindowFlags flags/* = vbox->setMargin(2); vbox->setSpacing(0); vbox->addWidget(this); - qDebug()<children()[0]->objectName(); installEventFilter(this); mFrameRect = m_frame->geometry(); @@ -362,6 +362,12 @@ int QssMainWindow::CalCursorPos(QPoint pt, int colPos) return ((pt.y() < FRAMESHAPE ? 10 : ((pt.y() > this->height() - FRAMESHAPE) ? 30 : 20)) + colPos); } +void QssMainWindow::SetTitleHeight(uint32_t height) +{ + this->m_titleBar->setFixedHeight(height); +} + + int QssMainWindow::CalCursorCol(QPoint pt) { return (pt.x() < FRAMESHAPE ? 1 : ((pt.x() > this->width() - FRAMESHAPE) ? 3 : 2)); @@ -477,13 +483,11 @@ void QssMainWindow::onMousePressEvent( QMouseEvent * ev ) } } m_rtPreGeometry = mFrameRect; - qDebug("frame geometry is %d %d %d %d",mFrameRect.x(),mFrameRect.y(), - mFrameRect.width(),mFrameRect.height()); + } void QssMainWindow::onMouseReleaseEvent( QMouseEvent * ev ) { - qDebug("mouse release"); m_bLeftPress = false; m_mousePressedInBoundy = false; } @@ -508,7 +512,6 @@ bool QssMainWindow::eventFilter( QObject * obj, QEvent * ev ) } else if (ev->type() == QEvent::MouseButtonPress) { - qDebug()<<"mouse button pressed\r\n"; QMouseEvent * mouseEv = dynamic_cast(ev); if (ev) { @@ -555,7 +558,6 @@ bool QssMainWindow::eventFilter( QObject * obj, QEvent * ev ) m_frame->setCursor(Qt::ArrowCursor); } if(ev->type() == QEvent::Resize){ - qDebug()<<"resize "; } } else if (obj == this) @@ -584,7 +586,6 @@ bool QssMainWindow::eventFilter( QObject * obj, QEvent * ev ) } } if(QEvent::Resize == ev->type()){ - qDebug()<parentWidget()->geometry(); } } @@ -596,6 +597,21 @@ bool QssMainWindow::eventFilter( QObject * obj, QEvent * ev ) return QMainWindow::eventFilter(obj, ev); } +void QssMainWindow::ScaleChanged(float scale) +{ + +} + +WId QssMainWindow::GetWID() const +{ + +} + +void QssMainWindow::SetScale(float scale) +{ + +} + QssDialog::QssDialog(QWidget *parent) : QDialog(0), m_mousePressedInBorder(false), @@ -697,8 +713,7 @@ void QssDialog::setWindowIcon( QIcon icon ) void QssDialog::onMouseMoveEvent( QMouseEvent * ev ) { - if (m_mousePressedInBorder) - { + if (m_mousePressedInBorder) { int x = ev->globalPos().x(); int y = ev->globalPos().y(); @@ -728,8 +743,7 @@ void QssDialog::onMouseMoveEvent( QMouseEvent * ev ) mFrameRect = rc; m_pos = ev->globalPos(); } - else - { + else { int x = ev->x() + QSSDIALOG_SHADOW_WIDTH - 2; int y = ev->y() + QSSDIALOG_SHADOW_WIDTH - 2; diff --git a/Qss.h b/Qss.h index 4a5abcf..8f37136 100644 --- a/Qss.h +++ b/Qss.h @@ -64,7 +64,8 @@ public: enum QTitleBar_Type { - QTitleBar_Type_MainWindow = QTitleBar_Button_Min | QTitleBar_Button_Max | QTitleBar_Button_Restore | QTitleBar_Button_Close, + QTitleBar_Type_MainWindow = QTitleBar_Button_Min | + QTitleBar_Button_Max |QTitleBar_Button_Restore | QTitleBar_Button_Close, QTitleBar_Type_Dialog = QTitleBar_Button_Close, QTitleBar_Type_MessageBox = QTitleBar_Button_Close }; @@ -111,7 +112,7 @@ private: QTitleBar_Type m_type; }; -class QssMainWindow : public QMainWindow +class QssMainWindow : public QMainWindow,ICallDPIChanged { Q_OBJECT @@ -130,7 +131,7 @@ public: void setWindowTitle( QString title ); void setWindowIcon( QIcon icon ); int CalCursorPos(QPoint pt, int colPos); - + void SetTitleHeight(uint32_t height); inline QssTtitleBar* titleBar(){return m_titleBar;} inline QFrame* frame(){return m_frame;} int CalCursorCol(QPoint pt); //计算鼠标X的位置 @@ -149,6 +150,9 @@ protected: QssTtitleBar* m_titleBar; void showEvent(QShowEvent *ev); + virtual void ScaleChanged(float scale) ; + virtual WId GetWID() const; + virtual void SetScale(float scale) ; private: QRect m_rcValid;//桌面最大可用尺寸 diff --git a/css/qss.css b/css/qss.css index 83cbc7b..32a17ae 100644 --- a/css/qss.css +++ b/css/qss.css @@ -68,12 +68,9 @@ QPushButton#btn_process:enabled:pressed{ } QWidget { - font-size: 15px; + font-size: 20px; } -QWidget:QLabel{ - font-size: 15px; -} QWidget#customWidget { background: rgb(173, 202, 232); } @@ -108,7 +105,6 @@ QWidget#titlebar{ background: rgb(7,71,166); border: 0px; margin: 0px; - } QWidget#remoteWidget { border-top-right-radius: 10px; @@ -171,21 +167,22 @@ QMenu { } - +QssMessageBox#messagebox{ + background: rgb(0, 0, 250); +} QPushButton#titlebaricon{ - image: url(:/qss/icon/logo.png); + /* image: url(:/qss/icon/logo.png);*/ background: rgb(7,71,166); - width: 25px; - height:25px; + width: 30px; + height:30px; } -QLable#titlebartitle{ +QLable#titlebartitle1{ + font-family:"微软雅黑"; color: white; - font-family: Arial; -} -QPushButton#titlebartitle{ - font: 12px sans-serif; + font-size: 16px; } + QPushButton#titlebarclosebtn{ image: url(":/qss/icon/btn_close_down.svg"); background: rgb(7,71,166); @@ -817,7 +814,7 @@ QLabel#seperateLabel { QLabel#radiusBlueLabel { border-radius: 15px; color: white; - font-size: 15px; + font-size: 18px; background: rgb(0, 78, 161); } @@ -889,7 +886,7 @@ QPushButton{ border: none; width: 75px; height: 25px; - font-size: 15px; + font-size: 18px; color: black; } QPushButton:enabled { diff --git a/icon/1-最大化.svg b/icon/1-最大化.svg new file mode 100644 index 0000000..b704561 --- /dev/null +++ b/icon/1-最大化.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon/array.svg b/icon/array.svg new file mode 100644 index 0000000..7ae234d --- /dev/null +++ b/icon/array.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon/boolean.svg b/icon/boolean.svg new file mode 100644 index 0000000..6592ee0 --- /dev/null +++ b/icon/boolean.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon/combo_arrow.png b/icon/combo_arrow.png index 6ad0a08..09751e1 100644 Binary files a/icon/combo_arrow.png and b/icon/combo_arrow.png differ diff --git a/icon/int.png b/icon/int.png new file mode 100644 index 0000000..1052220 Binary files /dev/null and b/icon/int.png differ diff --git a/icon/int.svg b/icon/int.svg index c01e055..9ce427c 100644 --- a/icon/int.svg +++ b/icon/int.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icon/objects.svg b/icon/objects.svg index 348d62b..2f33712 100644 --- a/icon/objects.svg +++ b/icon/objects.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icon/关闭.svg b/icon/关闭.svg new file mode 100644 index 0000000..90e1a95 --- /dev/null +++ b/icon/关闭.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon/最小化.svg b/icon/最小化.svg new file mode 100644 index 0000000..171b4f6 --- /dev/null +++ b/icon/最小化.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qss.qrc b/qss.qrc index 0c24518..0f3e910 100644 --- a/qss.qrc +++ b/qss.qrc @@ -41,7 +41,6 @@ icon/logo.png icon/key.svg icon/action_config.png - icon/code-array.svg icon/int.svg icon/objects.svg icon/string.svg