← Back to branch summary

~ubuntu-branches/ubuntu/wily/marble/wily-proposed

« back to all changes in this revision

Viewing changes to src/plugins/render/navigation/NavigationFloatItem.cpp

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark, Jonathan Riddell, Scarlett Clark
  • Date: 2014-07-24 23:38:32 UTC
  • mfrom: (1.5.2)
  • Revision ID: package-import@ubuntu.com-20140724233832-7v4421t4khrhw487
Tags: 4:4.13.90-0ubuntu1
[ Jonathan Riddell ]
* Switch to libmarblewidget19 for new soversion

[ Scarlett Clark ]
* New upstream beta release
* Update: do_not_install_private_headers. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/render/navigation/NavigationFloatItem.cpp
13
13
#include "NavigationFloatItem.h"
14
14
 
15
15
#include <qmath.h>
 
16
#include <QContextMenuEvent>
16
17
#include <QRect>
17
18
#include <QPixmap>
18
19
#include <QToolButton>
140
141
    return m_widgetItem;
141
142
}
142
143
 
143
 
void NavigationFloatItem::changeViewport( ViewportParams *viewport )
 
144
void NavigationFloatItem::setProjection( const ViewportParams *viewport )
144
145
{
145
146
    if ( viewport->radius() != m_oldViewportRadius ) {
146
147
        m_oldViewportRadius = viewport->radius();
147
148
        // The slider depends on the map state (zoom factor)
148
149
        update();
149
150
    }
 
151
 
 
152
    AbstractFloatItem::setProjection( viewport );
150
153
}
151
154
 
152
155
bool NavigationFloatItem::eventFilter( QObject *object, QEvent *e )
225
228
    }
226
229
}
227
230
 
228
 
QPixmap NavigationFloatItem::pixmap( const QString &id ) const
 
231
QPixmap NavigationFloatItem::pixmap( const QString &id )
229
232
{
230
233
    QPixmap result;
231
234
    if ( !QPixmapCache::find( id, result ) ) {