Auto emit characterSelected signal

nyalldawson · nyalldawson · commit bd13c36061a5 · 2019-05-02T15:13:38.000+10:00
diff --git a/src/gui/symbology/characterwidget.cpp b/src/gui/symbology/characterwidget.cpp
@@ -111,6 +111,7 @@ void CharacterWidget::setColumns( int columns )
 
 void CharacterWidget::setCharacter( QChar character )
 {
+  const bool changed = character != mLastKey;
   mLastKey = character.unicode();
   QWidget *widget = parentWidget();
   if ( widget )
@@ -119,6 +120,9 @@ void CharacterWidget::setCharacter( QChar character )
     if ( scrollArea && mLastKey < 65536 )
       scrollArea->verticalScrollBar()->setValue( mLastKey / mColumns * mSquareSize );
   }
+  if ( changed )
+    emit characterSelected( mLastKey );
+
   update();
 }
 
@@ -141,7 +145,6 @@ void CharacterWidget::keyPressEvent( QKeyEvent *event )
     if ( chr.unicode() != mLastKey )
     {
       setCharacter( chr );
-      emit characterSelected( chr );
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ void CharacterWidget::setColumns( int columns )`
`111`	`111`
`112`	`112`	`void CharacterWidget::setCharacter( QChar character )`
`113`	`113`	`{`
	`114`	`+ const bool changed = character != mLastKey;`
`114`	`115`	`mLastKey = character.unicode();`
`115`	`116`	`QWidget *widget = parentWidget();`
`116`	`117`	`if ( widget )`
`@@ -119,6 +120,9 @@ void CharacterWidget::setCharacter( QChar character )`
`119`	`120`	`if ( scrollArea && mLastKey < 65536 )`
`120`	`121`	`scrollArea->verticalScrollBar()->setValue( mLastKey / mColumns * mSquareSize );`
`121`	`122`	`}`
	`123`	`+ if ( changed )`
	`124`	`+ emit characterSelected( mLastKey );`
	`125`	`+`
`122`	`126`	`update();`
`123`	`127`	`}`
`124`	`128`
`@@ -141,7 +145,6 @@ void CharacterWidget::keyPressEvent( QKeyEvent *event )`
`141`	`145`	`if ( chr.unicode() != mLastKey )`
`142`	`146`	`{`
`143`	`147`	`setCharacter( chr );`
`144`		`- emit characterSelected( chr );`
`145`	`148`	`}`
`146`	`149`	`}`
`147`	`150`	`}`