FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #587 and revert tabbar doc mode

Browse Source
This commit is contained in:
Martin Rotter 2022-01-29 16:00:36 +01:00
parent 9d0d8ce14e
commit cdc8f3e42a
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librssguard/gui/feedmessageviewer.cpp
View File

@ -86,9 +86,6 @@ FeedsToolBar* FeedMessageViewer::feedsToolBar() const {
void FeedMessageViewer::saveSize() { void FeedMessageViewer::saveSize() {
Settings* settings = qApp->settings(); Settings* settings = qApp->settings();
// Store offsets of splitters.
settings->setValue(GROUP(GUI), GUI::SplitterFeeds, toVariant(m_feedSplitter->sizes()));
settings->setValue(GROUP(GUI), GUI::MessageViewState, QString(m_messagesView->saveHeaderState().toBase64())); settings->setValue(GROUP(GUI), GUI::MessageViewState, QString(m_messagesView->saveHeaderState().toBase64()));
// Store "visibility" of toolbars and list headers. // Store "visibility" of toolbars and list headers.
@ -132,7 +129,13 @@ bool FeedMessageViewer::areListHeadersEnabled() const {
return m_listHeadersEnabled; return m_listHeadersEnabled;
} }
void FeedMessageViewer::onSplitterResized() { void FeedMessageViewer::onFeedSplitterResized() {
qDebugNN << LOGSEC_GUI << "Feed splitter moved.";
qApp->settings()->setValue(GROUP(GUI), GUI::SplitterFeeds, toVariant(m_feedSplitter->sizes()));
}
void FeedMessageViewer::onMessageSplitterResized() {
qDebugNN << LOGSEC_GUI << "Message splitter moved."; qDebugNN << LOGSEC_GUI << "Message splitter moved.";
if (m_messageSplitter->orientation() == Qt::Orientation::Vertical) { if (m_messageSplitter->orientation() == Qt::Orientation::Vertical) {
@ -232,7 +235,7 @@ void FeedMessageViewer::alternateRowColorsInLists() {
} }
void FeedMessageViewer::respondToMainWindowResizes() { void FeedMessageViewer::respondToMainWindowResizes() {
connect(qApp->mainForm(), &FormMain::windowResized, this, &FeedMessageViewer::onSplitterResized); connect(qApp->mainForm(), &FormMain::windowResized, this, &FeedMessageViewer::onMessageSplitterResized);
} }
void FeedMessageViewer::displayMessage(const Message& message, RootItem* root) { void FeedMessageViewer::displayMessage(const Message& message, RootItem* root) {
@ -250,7 +253,8 @@ void FeedMessageViewer::createConnections() {
connect(m_toolBarFeeds, &FeedsToolBar::feedsFilterPatternChanged, m_feedsView, &FeedsView::filterItems); connect(m_toolBarFeeds, &FeedsToolBar::feedsFilterPatternChanged, m_feedsView, &FeedsView::filterItems);
connect(m_toolBarMessages, &MessagesToolBar::messageFilterChanged, m_messagesView, &MessagesView::filterMessages); connect(m_toolBarMessages, &MessagesToolBar::messageFilterChanged, m_messagesView, &MessagesView::filterMessages);
connect(m_messageSplitter, &QSplitter::splitterMoved, this, &FeedMessageViewer::onSplitterResized); connect(m_feedSplitter, &QSplitter::splitterMoved, this, &FeedMessageViewer::onFeedSplitterResized);
connect(m_messageSplitter, &QSplitter::splitterMoved, this, &FeedMessageViewer::onMessageSplitterResized);
connect(m_messagesView, &MessagesView::currentMessageRemoved, m_messagesBrowser, &MessagePreviewer::clear); connect(m_messagesView, &MessagesView::currentMessageRemoved, m_messagesBrowser, &MessagePreviewer::clear);
connect(m_messagesBrowser, &MessagePreviewer::markMessageRead, m_messagesView->sourceModel(), &MessagesModel::setMessageReadById); connect(m_messagesBrowser, &MessagePreviewer::markMessageRead, m_messagesView->sourceModel(), &MessagesModel::setMessageReadById);
@ -311,7 +315,7 @@ void FeedMessageViewer::initializeViews() {
m_messagesView->setFrameStyle(QFrame::Shape::NoFrame); m_messagesView->setFrameStyle(QFrame::Shape::NoFrame);
// Setup message splitter. // Setup message splitter.
m_messageSplitter->setObjectName(QSL("MessageSplitter")); m_messageSplitter->setObjectName(QSL("m_messageSplitter"));
m_messageSplitter->setHandleWidth(1); m_messageSplitter->setHandleWidth(1);
m_messageSplitter->setOpaqueResize(true); m_messageSplitter->setOpaqueResize(true);
m_messageSplitter->setChildrenCollapsible(false); m_messageSplitter->setChildrenCollapsible(false);

3
src/librssguard/gui/feedmessageviewer.h
View File

@ -72,7 +72,8 @@ class RSSGUARD_DLLSPEC FeedMessageViewer : public TabContent {
void respondToMainWindowResizes(); void respondToMainWindowResizes();
private slots: private slots:
void onSplitterResized(); void onFeedSplitterResized();
void onMessageSplitterResized();
void displayMessage(const Message& message, RootItem* root); void displayMessage(const Message& message, RootItem* root);
protected: protected:

2
src/librssguard/gui/tabbar.cpp
View File

@ -11,7 +11,7 @@
#include <QStyle> #include <QStyle>
TabBar::TabBar(QWidget* parent) : QTabBar(parent) { TabBar::TabBar(QWidget* parent) : QTabBar(parent) {
setDocumentMode(true); setDocumentMode(false);
setUsesScrollButtons(true); setUsesScrollButtons(true);
setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu); setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
} }