Skip to content

Commit

Permalink
Merge pull request #2014 from elpaso/hidpi-improvements
Browse files Browse the repository at this point in the history
Hidpi improvements
  • Loading branch information
m-kuhn committed Apr 28, 2015
2 parents 9f2c544 + 3c22aff commit 15c1dbc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/app/qgisapp.cpp
Expand Up @@ -1773,7 +1773,7 @@ void QgisApp::createStatusBar()
mCoordsLabel->setObjectName( "mCoordsLabel" ); mCoordsLabel->setObjectName( "mCoordsLabel" );
mCoordsLabel->setFont( myFont ); mCoordsLabel->setFont( myFont );
mCoordsLabel->setMinimumWidth( 10 ); mCoordsLabel->setMinimumWidth( 10 );
mCoordsLabel->setMaximumHeight( 20 ); //mCoordsLabel->setMaximumHeight( 20 );
mCoordsLabel->setMargin( 3 ); mCoordsLabel->setMargin( 3 );
mCoordsLabel->setAlignment( Qt::AlignCenter ); mCoordsLabel->setAlignment( Qt::AlignCenter );
mCoordsLabel->setFrameStyle( QFrame::NoFrame ); mCoordsLabel->setFrameStyle( QFrame::NoFrame );
Expand All @@ -1787,7 +1787,7 @@ void QgisApp::createStatusBar()
mCoordsEdit->setFont( myFont ); mCoordsEdit->setFont( myFont );
mCoordsEdit->setMinimumWidth( 10 ); mCoordsEdit->setMinimumWidth( 10 );
mCoordsEdit->setMaximumWidth( 300 ); mCoordsEdit->setMaximumWidth( 300 );
mCoordsEdit->setMaximumHeight( 20 ); //mCoordsEdit->setMaximumHeight( 20 );
mCoordsEdit->setContentsMargins( 0, 0, 0, 0 ); mCoordsEdit->setContentsMargins( 0, 0, 0, 0 );
mCoordsEdit->setAlignment( Qt::AlignCenter ); mCoordsEdit->setAlignment( Qt::AlignCenter );
QRegExp coordValidator( "[+-]?\\d+\\.?\\d*\\s*,\\s*[+-]?\\d+\\.?\\d*" ); QRegExp coordValidator( "[+-]?\\d+\\.?\\d*\\s*,\\s*[+-]?\\d+\\.?\\d*" );
Expand All @@ -1807,7 +1807,7 @@ void QgisApp::createStatusBar()
mScaleLabel->setObjectName( "mScaleLable" ); mScaleLabel->setObjectName( "mScaleLable" );
mScaleLabel->setFont( myFont ); mScaleLabel->setFont( myFont );
mScaleLabel->setMinimumWidth( 10 ); mScaleLabel->setMinimumWidth( 10 );
mScaleLabel->setMaximumHeight( 20 ); //mScaleLabel->setMaximumHeight( 20 );
mScaleLabel->setMargin( 3 ); mScaleLabel->setMargin( 3 );
mScaleLabel->setAlignment( Qt::AlignCenter ); mScaleLabel->setAlignment( Qt::AlignCenter );
mScaleLabel->setFrameStyle( QFrame::NoFrame ); mScaleLabel->setFrameStyle( QFrame::NoFrame );
Expand All @@ -1823,7 +1823,7 @@ void QgisApp::createStatusBar()
mScaleEdit->lineEdit()->setFont( myFont ); mScaleEdit->lineEdit()->setFont( myFont );
mScaleEdit->setMinimumWidth( 10 ); mScaleEdit->setMinimumWidth( 10 );
mScaleEdit->setMaximumWidth( 100 ); mScaleEdit->setMaximumWidth( 100 );
mScaleEdit->setMaximumHeight( 20 ); //mScaleEdit->setMaximumHeight( 20 );
mScaleEdit->setContentsMargins( 0, 0, 0, 0 ); mScaleEdit->setContentsMargins( 0, 0, 0, 0 );
mScaleEdit->setWhatsThis( tr( "Displays the current map scale" ) ); mScaleEdit->setWhatsThis( tr( "Displays the current map scale" ) );
mScaleEdit->setToolTip( tr( "Current map scale (formatted as x:y)" ) ); mScaleEdit->setToolTip( tr( "Current map scale (formatted as x:y)" ) );
Expand All @@ -1838,7 +1838,7 @@ void QgisApp::createStatusBar()
mRotationLabel->setObjectName( "mRotationLabel" ); mRotationLabel->setObjectName( "mRotationLabel" );
mRotationLabel->setFont( myFont ); mRotationLabel->setFont( myFont );
mRotationLabel->setMinimumWidth( 10 ); mRotationLabel->setMinimumWidth( 10 );
mRotationLabel->setMaximumHeight( 20 ); //mRotationLabel->setMaximumHeight( 20 );
mRotationLabel->setMargin( 3 ); mRotationLabel->setMargin( 3 );
mRotationLabel->setAlignment( Qt::AlignCenter ); mRotationLabel->setAlignment( Qt::AlignCenter );
mRotationLabel->setFrameStyle( QFrame::NoFrame ); mRotationLabel->setFrameStyle( QFrame::NoFrame );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsattributetableview.cpp
Expand Up @@ -45,7 +45,7 @@ QgsAttributeTableView::QgsAttributeTableView( QWidget *parent )
QSettings settings; QSettings settings;
restoreGeometry( settings.value( "/BetterAttributeTable/geometry" ).toByteArray() ); restoreGeometry( settings.value( "/BetterAttributeTable/geometry" ).toByteArray() );


verticalHeader()->setDefaultSectionSize( 20 ); //verticalHeader()->setDefaultSectionSize( 20 );
horizontalHeader()->setHighlightSections( false ); horizontalHeader()->setHighlightSections( false );


mTableDelegate = new QgsAttributeTableDelegate( this ); mTableDelegate = new QgsAttributeTableDelegate( this );
Expand Down

0 comments on commit 15c1dbc

Please sign in to comment.