2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 16:15:13 +00:00

some namespaces reorganized, author photo display added to wide mode (where messages are centered), version 0.9.20.dev

This commit is contained in:
John Preston
2016-02-08 17:54:55 +03:00
parent 5320285943
commit 80ba0259dd
46 changed files with 400 additions and 381 deletions

View File

@@ -2268,7 +2268,7 @@ void DialogsWidget::dragEnterEvent(QDragEnterEvent *e) {
_dragForward = e->mimeData()->hasFormat(qsl("application/x-td-forward-selected"));
if (!_dragForward) _dragForward = e->mimeData()->hasFormat(qsl("application/x-td-forward-pressed-link"));
if (!_dragForward) _dragForward = e->mimeData()->hasFormat(qsl("application/x-td-forward-pressed"));
if (_dragForward && !cWideMode()) _dragForward = false;
if (_dragForward && Adaptive::OneColumn()) _dragForward = false;
if (_dragForward) {
e->setDropAction(Qt::CopyAction);
e->accept();
@@ -2540,7 +2540,7 @@ bool DialogsWidget::onCancelSearch() {
_searchRequest = 0;
}
if (_searchInPeer && !clearing) {
if (!cWideMode()) {
if (Adaptive::OneColumn()) {
Ui::showPeerHistory(_searchInPeer, ShowAtUnreadMsgId);
}
_searchInPeer = _searchInMigrated = 0;
@@ -2560,7 +2560,7 @@ void DialogsWidget::onCancelSearchInPeer() {
_searchRequest = 0;
}
if (_searchInPeer) {
if (!cWideMode() && !App::main()->selectingPeer()) {
if (Adaptive::OneColumn() && !App::main()->selectingPeer()) {
Ui::showPeerHistory(_searchInPeer, ShowAtUnreadMsgId);
}
_searchInPeer = _searchInMigrated = 0;
@@ -2570,7 +2570,7 @@ void DialogsWidget::onCancelSearchInPeer() {
_filter.clear();
_filter.updatePlaceholder();
onFilterUpdate();
if (cWideMode() && !App::main()->selectingPeer()) {
if (!Adaptive::OneColumn() && !App::main()->selectingPeer()) {
emit cancelled();
}
}