hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 04:24:09 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Remove 0xAD symbol (soft hyphen) for popup window search

Browse source
This commit is contained in:
Abs62 2023-01-18 20:25:03 +03:00
parent 46a34e805c
commit 1921771bbd
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.cc
View file

@ -193,7 +193,7 @@ InputPhrase Preferences::sanitizeInputPhrase( QString const & inputPhrase ) cons
return result; return result;
} }
const QString withPunct = inputPhrase.simplified(); const QString withPunct = inputPhrase.simplified().remove( QChar( 0xAD ) ); // Simplify whitespaces and remove soft hyphens
result.phrase = gd::toQString( Folding::trimWhitespaceOrPunct( gd::toWString( withPunct ) ) ); result.phrase = gd::toQString( Folding::trimWhitespaceOrPunct( gd::toWString( withPunct ) ) );
if ( !result.isValid() ) if ( !result.isValid() )
return result; // The suffix of an invalid input phrase must be empty. return result; // The suffix of an invalid input phrase must be empty.

10
mouseover.cc
View file

@ -294,7 +294,7 @@ LRESULT CALLBACK MouseOver::eventHandler( HWND hwnd_, UINT msg,
return 0; return 0;
} }
else else
if ( !wordSeq[ wordSeqPos ].isLetterOrNumber() ) if ( !( wordSeq[ wordSeqPos ].isLetterOrNumber() || wordSeq[ wordSeqPos ] == QChar( 0xAD ) ) ) // Assume soft hyphen as letter
{ {
// Special case: the cursor points to something which doesn't look like a // Special case: the cursor points to something which doesn't look like a
// middle of the word -- assume that it's something that joins two words // middle of the word -- assume that it's something that joins two words
@ -303,13 +303,13 @@ LRESULT CALLBACK MouseOver::eventHandler( HWND hwnd_, UINT msg,
int begin = wordSeqPos; int begin = wordSeqPos;
for( ; begin; --begin ) for( ; begin; --begin )
if ( !wordSeq[ begin - 1 ].isLetterOrNumber() ) if ( !( wordSeq[ begin - 1 ].isLetterOrNumber() || wordSeq[ begin - 1 ] == QChar( 0xAD ) ) )
break; break;
int end = wordSeqPos; int end = wordSeqPos;
while( ++end < wordSeq.size() ) while( ++end < wordSeq.size() )
if ( !wordSeq[ end ].isLetterOrNumber() ) if ( !( wordSeq[ end ].isLetterOrNumber() || wordSeq[ end ] == QChar( 0xAD ) ) )
break; break;
if ( end - begin == 1 ) if ( end - begin == 1 )
@ -327,14 +327,14 @@ LRESULT CALLBACK MouseOver::eventHandler( HWND hwnd_, UINT msg,
int begin = wordSeqPos; int begin = wordSeqPos;
for( ; begin; --begin ) for( ; begin; --begin )
if ( !wordSeq[ begin - 1 ].isLetterOrNumber() ) if ( !( wordSeq[ begin - 1 ].isLetterOrNumber() || wordSeq[ begin - 1 ] == QChar( 0xAD ) ) )
break; break;
int end = wordSeqPos; int end = wordSeqPos;
while( ++end < wordSeq.size() ) while( ++end < wordSeq.size() )
{ {
if ( !wordSeq[ end ].isLetterOrNumber() ) if ( !( wordSeq[ end ].isLetterOrNumber() || wordSeq[ end ] == QChar( 0xAD ) ) )
break; break;
} }
word = wordSeq.mid( begin, end - begin ); word = wordSeq.mid( begin, end - begin );