StelDialog.cpp   StelDialog.cpp 
skipping to change at line 30 skipping to change at line 30
#include "StelDialog.hpp" #include "StelDialog.hpp"
#include "StelMainView.hpp" #include "StelMainView.hpp"
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include <QDebug> #include <QDebug>
#include <QDialog> #include <QDialog>
#include <QGraphicsProxyWidget> #include <QGraphicsProxyWidget>
#include <QStyleOptionGraphicsItem> #include <QStyleOptionGraphicsItem>
#include <QSettings> #include <QSettings>
#include <QScroller> #ifdef Q_OS_WIN
#include <QScroller>
#endif
class CustomProxy : public QGraphicsProxyWidget class CustomProxy : public QGraphicsProxyWidget
{ {
public: public:
CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0) : QGraphicsProxyWidget(parent, wFlags) CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0) : QGraphicsProxyWidget(parent, wFlags)
{ {
setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
} }
//! Reimplement this method to add windows decorations. Curr ently there are invisible 2 px decorations //! Reimplement this method to add windows decorations. Curr ently there are invisible 2 px decorations
void paintWindowFrame(QPainter*, const QStyleOptionGraphicsI tem*, QWidget*) void paintWindowFrame(QPainter*, const QStyleOptionGraphicsI tem*, QWidget*)
skipping to change at line 158 skipping to change at line 160
} }
else else
{ {
dialog->hide(); dialog->hide();
emit visibleChanged(false); emit visibleChanged(false);
//proxy->clearFocus(); //proxy->clearFocus();
StelMainView::getInstance().focusSky(); StelMainView::getInstance().focusSky();
} }
} }
#ifdef Q_OS_WIN
void StelDialog::installKineticScrolling(QList<QWidget *> addscroll) void StelDialog::installKineticScrolling(QList<QWidget *> addscroll)
{ {
return; // Temporary disable feature, bug in Qt: https://bugreports. qt-project.org/browse/QTBUG-41299 return; // Temporary disable feature, bug in Qt: https://bugreports. qt-project.org/browse/QTBUG-41299
if (StelApp::getInstance().getSettings()->value("gui/flag_enable_kin etic_scrolling", true).toBool() == false) if (StelApp::getInstance().getSettings()->value("gui/flag_enable_kin etic_scrolling", true).toBool() == false)
return; return;
foreach(QWidget * w, addscroll) foreach(QWidget * w, addscroll)
{ {
QScroller::grabGesture(w, QScroller::LeftMouseButtonGesture) ; QScroller::grabGesture(w, QScroller::LeftMouseButtonGesture) ;
QScroller::scroller(w); QScroller::scroller(w);
} }
} }
#endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/