Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-01 04:46:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Change Chat History Dialog to no modal.

Browse source 
It will be updated when new message comes.
This commit is contained in:
Phenom 2020-11-07 18:09:50 +01:00
parent e0ce5632ef
commit b1129df077
10 changed files with 81 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -42,7 +42,6 @@
#include "gui/settings/rsharesettings.h"
#include "gui/settings/rsettingswin.h"
#include "gui/settings/RsharePeerSettings.h"
#include "gui/im_history/ImHistoryBrowser.h"
#include "gui/common/StatusDefs.h"
#include "gui/common/FilesDefs.h"
#include "gui/common/Emoticons.h"
@ -78,7 +77,7 @@ ChatWidget::ChatWidget(QWidget *parent)
, lastStatusSendTime(0)
, firstShow(true), inChatCharFormatChanged(false), firstSearch(true)
, lastUpdateCursorPos(0), lastUpdateCursorEnd(0)
, completer(NULL), notify(NULL)
, completer(NULL), imBrowser(NULL), notify(NULL)
, ui(new Ui::ChatWidget)
{
ui->setupUi(this);
@ -87,8 +86,8 @@ ChatWidget::ChatWidget(QWidget *parent)
double fmm = iconHeight > FMM_THRESHOLD ? FMM : FMM_SMALLER;
iconHeight *= fmm;
QSize iconSize = QSize(iconHeight, iconHeight);
int butt_size(iconSize.height() + fmm);
QSize buttonSize = QSize(butt_size, butt_size);
//int butt_size(iconSize.height() + fmm);
//QSize buttonSize = QSize(butt_size, butt_size);
lastMsgDate = QDate::currentDate();
@ -1607,8 +1606,9 @@ void ChatWidget::deleteChatHistory()
void ChatWidget::messageHistory()
{
ImHistoryBrowser imBrowser(chatId, ui->chatTextEdit, window());
imBrowser.exec();
if (!imBrowser)
imBrowser = new ImHistoryBrowser(chatId, ui->chatTextEdit, this->title, window());
imBrowser->show();
}
void ChatWidget::addExtraFile()