Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-24 17:00:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed layout update problem when switching channels

Browse Source
This commit is contained in:
csoler 2023-04-22 16:19:04 +02:00
parent 2cb8736804
commit 9d956f6126
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
View File

@ -279,18 +279,18 @@ void ChannelPostDelegate::setWidgetGrid(bool use_grid)
QWidget *ChannelPostFilesDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/*option*/, const QModelIndex& index) const QWidget *ChannelPostFilesDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/*option*/, const QModelIndex& index) const
{ {
ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ; ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE) if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE)
{ {
GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent,true); GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent,true);
w->setFocusPolicy(Qt::StrongFocus); w->setFocusPolicy(Qt::StrongFocus);
connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB())); connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB()));
return w; return w;
} }
else else
return NULL; return NULL;
} }
void ChannelPostFilesDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const void ChannelPostFilesDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
{ {
@ -392,7 +392,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
mChannelPostsDelegate->setAspectRatio(ChannelPostThumbnailView::ASPECT_RATIO_16_9); mChannelPostsDelegate->setAspectRatio(ChannelPostThumbnailView::ASPECT_RATIO_16_9);
connect(ui->postsTree,SIGNAL(zoomRequested(bool)),this,SLOT(updateZoomFactor(bool))); connect(ui->postsTree,SIGNAL(zoomRequested(bool)),this,SLOT(onUpdateZoomFactor(bool)));
connect(ui->commentsDialog,SIGNAL(commentsLoaded(int)),this,SLOT(updateCommentsCount(int))); connect(ui->commentsDialog,SIGNAL(commentsLoaded(int)),this,SLOT(updateCommentsCount(int)));
ui->channelPostFiles_TV->setModel(mChannelPostFilesModel = new RsGxsChannelPostFilesModel(this)); ui->channelPostFiles_TV->setModel(mChannelPostFilesModel = new RsGxsChannelPostFilesModel(this));
@ -520,9 +520,17 @@ void GxsChannelPostsWidgetWithModel::currentTabChanged(int t)
break; break;
} }
} }
void GxsChannelPostsWidgetWithModel::updateZoomFactor(bool zoom_or_unzoom) void GxsChannelPostsWidgetWithModel::onUpdateZoomFactor(bool zoom_or_unzoom)
{ {
mChannelPostsDelegate->zoom(zoom_or_unzoom); if(zoom_or_unzoom)
updateZoomFactor(1);
else
updateZoomFactor(-1);
}
void GxsChannelPostsWidgetWithModel::updateZoomFactor(int what_to_do)
{
if(what_to_do != 0)
mChannelPostsDelegate->zoom(what_to_do > 0);
for(int i=0;i<mChannelPostsModel->columnCount();++i) for(int i=0;i<mChannelPostsModel->columnCount();++i)
ui->postsTree->setColumnWidth(i,mChannelPostsDelegate->cellSize(i,font(),ui->postsTree->width())); ui->postsTree->setColumnWidth(i,mChannelPostsDelegate->cellSize(i,font(),ui->postsTree->width()));
@ -532,8 +540,7 @@ void GxsChannelPostsWidgetWithModel::updateZoomFactor(bool zoom_or_unzoom)
int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),s.width())))); int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),s.width()))));
mChannelPostsModel->setNumColumns(n_columns); // forces the update mChannelPostsModel->setNumColumns(n_columns); // forces the update
mChannelPostsModel->triggerViewUpdate();
ui->postsTree->dataChanged(QModelIndex(),QModelIndex());
} }
void GxsChannelPostsWidgetWithModel::sortColumnPostFiles(int col,Qt::SortOrder so) void GxsChannelPostsWidgetWithModel::sortColumnPostFiles(int col,Qt::SortOrder so)
@ -1067,8 +1074,9 @@ void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
best = i; best = i;
mChannelPostsDelegate->setAspectRatio(static_cast<ChannelPostThumbnailView::AspectRatio>(best)); mChannelPostsDelegate->setAspectRatio(static_cast<ChannelPostThumbnailView::AspectRatio>(best));
mChannelPostsModel->triggerViewUpdate();
handlePostsTreeSizeChange(ui->postsTree->size(),true); // force the update handlePostsTreeSizeChange(ui->postsTree->size(),true); // force the update
updateZoomFactor(0);
} }
void GxsChannelPostsWidgetWithModel::updateDisplay(bool update_group_data,bool update_posts) void GxsChannelPostsWidgetWithModel::updateDisplay(bool update_group_data,bool update_posts)

5
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
View File

@ -154,7 +154,7 @@ private slots:
void editPost(); void editPost();
void postContextMenu(const QPoint&); void postContextMenu(const QPoint&);
void copyMessageLink(); void copyMessageLink();
void updateZoomFactor(bool zoom_or_unzoom); void onUpdateZoomFactor(bool zoom_or_unzoom);
void switchView(); void switchView();
void switchOnlyUnread(bool b); void switchOnlyUnread(bool b);
void markMessageUnread(); void markMessageUnread();
@ -168,7 +168,8 @@ public slots:
void copyChannelFilesLink(); void copyChannelFilesLink();
private: private:
void processSettings(bool load); void updateZoomFactor(int what_to_do); // -1=unzoom, 0=nothing, 1=zoom
void processSettings(bool load);
RsGxsMessageId getCurrentItemId() const; RsGxsMessageId getCurrentItemId() const;
void selectItem(const RsGxsMessageId& msg_id); void selectItem(const RsGxsMessageId& msg_id);