Skip to content

Commit

Permalink
Set default margin units to MM
Browse files Browse the repository at this point in the history
  • Loading branch information
duncan-r authored and nyalldawson committed Jan 12, 2016
1 parent 3a1d47f commit 4af65e6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/app/qgsdecorationcopyright.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ QgsDecorationCopyright::QgsDecorationCopyright( QObject* parent )
, mMarginVertical( 0 )
{
mPlacement = BottomRight;
mMarginUnit = QgsSymbolV2::Pixel;
mMarginUnit = QgsSymbolV2::MM;

setName( "Copyright Label" );
// initialise default values in the gui
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdecorationitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ QgsDecorationItem::QgsDecorationItem( QObject* parent )
: QObject( parent )
, mEnabled( false )
, mPlacement( TopLeft )
, mMarginUnit( QgsSymbolV2::Pixel )
, mMarginUnit( QgsSymbolV2::MM )
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdecorationnortharrow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ QgsDecorationNorthArrow::QgsDecorationNorthArrow( QObject* parent )
, mMarginVertical( 0 )
{
mPlacement = BottomLeft;
mMarginUnit = QgsSymbolV2::Pixel;
mMarginUnit = QgsSymbolV2::MM;

setName( "North Arrow" );
projectRead();
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdecorationscalebar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ QgsDecorationScaleBar::QgsDecorationScaleBar( QObject* parent )
, mMarginVertical( 0 )
{
mPlacement = TopLeft;
mMarginUnit = QgsSymbolV2::Pixel;
mMarginUnit = QgsSymbolV2::MM;
mStyleLabels << tr( "Tick Down" ) << tr( "Tick Up" )
<< tr( "Bar" ) << tr( "Box" );

Expand Down

0 comments on commit 4af65e6

Please sign in to comment.