Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: The top toolbar background shading is inconsistent #125

Merged
merged 1 commit into from
Feb 2, 2024
Merged

fix: The top toolbar background shading is inconsistent #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions libimageviewer/viewpanel/viewpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
#include <QApplication>
#include <QStringList>
#include <QDesktopWidget>

#include <dshadowline.h>
#include <DDesktopServices>
#include <DMenu>
#include <DFileDialog>

#include "contents/bottomtoolbar.h"
#include "navigationwidget.h"
#include "lockwidget.h"
Expand Down Expand Up @@ -143,7 +142,12 @@ LibViewPanel::LibViewPanel(AbstractTopToolbar *customToolbar, QWidget *parent)
}
}
});

titleShadow= new DShadowLine(this);
titleShadow->setAttribute(Qt::WA_AlwaysStackOnTop);
QRect rect(0,m_topToolbar->geometry().bottom()+1,m_topToolbar->geometry().width(),titleShadow->sizeHint().height());
titleShadow->setGeometry(rect);
titleShadow->setVisible(true);
titleShadow->raise();
// 添加过滤处理，当窗口出现状态变更时(最大化、全屏)，处理标题栏隐藏、显示
if (window()) {
window()->installEventFilter(this);
Expand Down Expand Up @@ -324,7 +328,6 @@ void LibViewPanel::initTopBar()
} else {
m_topToolbar->setParent(dynamic_cast<QWidget *>(this->parent()));
}

m_topToolbar->resize(width(), titleBarHeight());
m_topToolbar->move(0, 0);
m_topToolbar->setTitleBarTransparent(false);
Expand Down Expand Up @@ -1262,7 +1265,7 @@ void LibViewPanel::slotsImageOutTitleBar(bool bRet)
m_ImageOutTitleBar = bRet;
slotBottomMove();
}

updateTitleShadow(!bRet);
}

void LibViewPanel::slotsDirectoryChanged(const QString &path)
Expand Down Expand Up @@ -2129,7 +2132,18 @@ void LibViewPanel::slotResetTransform(bool bRet)
m_view->fitImage();
}
}

void LibViewPanel::updateTitleShadow(bool toShow)
{
if (!titleShadow)
{
return;
}
QRect rect(0, 50, this->geometry().width(), titleShadow->sizeHint().height());
titleShadow->setGeometry(rect);
//对于全屏和图片高度过大进行隐身
titleShadow->setVisible(!window()->isFullScreen() && toShow);
titleShadow->raise();
}

void LibViewPanel::resizeEvent(QResizeEvent *e)
{
Expand Down Expand Up @@ -2157,7 +2171,6 @@ void LibViewPanel::resizeEvent(QResizeEvent *e)
m_topBarAnimation = nullptr;
}
if (this->m_topToolbar) {

if (window()->isFullScreen()) {
this->m_topToolbar->setVisible(false);

Expand All @@ -2178,6 +2191,7 @@ void LibViewPanel::resizeEvent(QResizeEvent *e)

//不需要动画滑动
noAnimationBottomMove();
updateTitleShadow(true);
}

void LibViewPanel::showEvent(QShowEvent *e)
Expand Down
4 changes: 4 additions & 0 deletions libimageviewer/viewpanel/viewpanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <DStackedWidget>
#include <DAnchors>
#include <DIconButton>
#include <dshadowline.h>

#include <bitset>

Expand Down Expand Up @@ -213,6 +214,7 @@ public slots:
Q_SLOT void onEnhanceStart();
Q_SLOT void onEnhanceReload(const QString &output);
Q_SLOT void onEnhanceEnd(const QString &source, const QString &output, int state);
void updateTitleShadow(bool toShow);

private:
DStackedWidget *m_stack = nullptr;
Expand All @@ -221,7 +223,9 @@ public slots:
ThumbnailWidget *m_thumbnailWidget = nullptr;
LibBottomToolbar *m_bottomToolbar = nullptr;
LibImageInfoWidget *m_info = nullptr;
DShadowLine *titleShadow = nullptr;
ExtensionPanel *m_extensionPanel {nullptr};

DAnchors<NavigationWidget> m_nav ;

//ocr接口
Expand Down
Loading