From c81beeb023c7d7bdc45cf5306b6b1af7b71d017c Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 17 Oct 2014 17:24:17 +0400 Subject: [PATCH] fixed new photoviewer for linux --- Telegram/SourceFiles/mediaview.cpp | 11 +++++------ Telegram/SourceFiles/pspecific_linux.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index d87f01cd2..13739313e 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -618,10 +618,7 @@ void MediaView::paintEvent(QPaintEvent *e) { } float64 progress = (hidingDt >= 0) ? (hidingDt / st::medviewSaveMsgHiding) : (dt / st::medviewSaveMsgShowing); _saveMsgOpacity.update(qMin(progress, 1.), anim::linear); - if (hidingDt >= 0) { - objc_outputDebugString(QString("Now updating hiding, dt: %1, progress: %2, opacity: %3").arg(hidingDt).arg(hidingDt >= 0 ? (hidingDt / st::medviewSaveMsgHiding) : (dt / st::medviewSaveMsgShowing)).arg(_saveMsgOpacity.current())); - } - if (_saveMsgOpacity.current() > 0) { + if (_saveMsgOpacity.current() > 0) { p.setOpacity(_saveMsgOpacity.current()); p.setBrush(st::medviewSaveMsg->b); p.setPen(Qt::NoPen); @@ -635,7 +632,7 @@ void MediaView::paintEvent(QPaintEvent *e) { p.setOpacity(1); } if (_full >= 1) { - uint64 nextFrame = (dt < st::medviewSaveMsgShowing || hidingDt >= 0 || true) ? AnimationTimerDelta : (st::medviewSaveMsgShowing + st::medviewSaveMsgShown + 1 - dt); + uint64 nextFrame = (dt < st::medviewSaveMsgShowing || hidingDt >= 0) ? int(AnimationTimerDelta) : (st::medviewSaveMsgShowing + st::medviewSaveMsgShown + 1 - dt); _saveMsgUpdater.start(nextFrame); } } else { @@ -945,7 +942,9 @@ bool MediaView::updateOverState(OverState newState) { void MediaView::updateOver(const QPoint &pos) { TextLinkPtr lnk; bool inText; - _saveMsgText.getState(lnk, inText, pos.x() - _saveMsg.x() - st::medviewSaveMsgPadding.left(), pos.y() - _saveMsg.y() - st::medviewSaveMsgPadding.top(), _saveMsg.width() - st::medviewSaveMsgPadding.left() - st::medviewSaveMsgPadding.right()); + if (_saveMsgStarted) { + _saveMsgText.getState(lnk, inText, pos.x() - _saveMsg.x() - st::medviewSaveMsgPadding.left(), pos.y() - _saveMsg.y() - st::medviewSaveMsgPadding.top(), _saveMsg.width() - st::medviewSaveMsgPadding.left() - st::medviewSaveMsgPadding.right()); + } if (lnk != textlnkOver()) { textlnkOver(lnk); setCursor((textlnkOver() || textlnkDown()) ? style::cur_pointer : style::cur_default); diff --git a/Telegram/SourceFiles/pspecific_linux.cpp b/Telegram/SourceFiles/pspecific_linux.cpp index 8d1937c93..09d14813e 100644 --- a/Telegram/SourceFiles/pspecific_linux.cpp +++ b/Telegram/SourceFiles/pspecific_linux.cpp @@ -294,9 +294,11 @@ QRect psDesktopRect() { } void psShowOverAll(QWidget *w, bool canFocus) { + w->show(); } void psBringToBack(QWidget *w) { + w->hide(); } void PsMainWindow::psActivateNotify(NotifyWindow *w) { @@ -956,8 +958,9 @@ void psOpenFile(const QString &name, bool openWith) { } void psShowInFolder(const QString &name) { - QDesktopServices::openUrl(QFileInfo(name).absoluteDir().absolutePath()); -// system(("nautilus " + QFileInfo(name).absoluteDir().absolutePath()).toUtf8().constData()); +// QDesktopServices::openUrl(QFileInfo(name).absoluteDir().absolutePath()); + App::wnd()->layerHidden(); + system(("nautilus \"" + QFileInfo(name).absoluteDir().absolutePath() + "\"").toUtf8().constData()); //objc_showInFinder(name, QFileInfo(name).absolutePath()); }