MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed single-column on retina, fixed save from mediaview

Browse Source
This commit is contained in:
John Preston 2014-12-12 19:45:43 +03:00
parent 8d3aa5c31e
commit c964742227
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/gui/flatbutton.cpp
View File

@ -233,12 +233,10 @@ void MaskedButton::paintEvent(QPaintEvent *e) {
p.drawText(t.x(), t.y() + _st.font->ascent, _text);
}
const QRect &i((_state & StateDown) ? _st.downIcon : _st.icon);
if (i.width()) {
const style::sprite &i((_state & StateDown) ? _st.downIcon : _st.icon);
if (i.pxWidth()) {
const QPoint &t((_state & StateDown) ? _st.downIconPos : _st.iconPos);
QRect r(i);
r.moveTo(t);
p.fillRect(r, a_bg.current());
p.fillRect(QRect(t, QSize(i.pxWidth(), i.pxHeight())), a_bg.current());
p.drawPixmap(t, App::sprite(), i);
}
}

2
Telegram/SourceFiles/mediaview.cpp
View File

@ -1148,7 +1148,7 @@ void MediaView::receiveMouse() {
void MediaView::onCheckActive() {
if (App::wnd() && isVisible()) {
if (App::wnd()->isActiveWindow()) {
if (App::wnd()->isActiveWindow() && App::wnd()->hasFocus()) {
activateWindow();
setFocus();
}

4
Telegram/SourceFiles/window.cpp
View File

@ -329,9 +329,9 @@ NotifyWindow::~NotifyWindow() {
if (App::wnd()) App::wnd()->notifyShowNext(this);
}
Window::Window(QWidget *parent) : PsMainWindow(parent),
Window::Window(QWidget *parent) : PsMainWindow(parent), _serviceHistoryRequest(0),
intro(0), main(0), settings(0), layerBG(0), _topWidget(0),
_connecting(0), _clearManager(0), dragging(false), _inactivePress(false), _mediaView(0), _serviceHistoryRequest(0) {
_connecting(0), _clearManager(0), dragging(false), _inactivePress(false), _mediaView(0) {
icon16 = icon256.scaledToWidth(16, Qt::SmoothTransformation);
icon32 = icon256.scaledToWidth(32, Qt::SmoothTransformation);