Skip to content

[#26] Fix selection multiline #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kreuzberger merged 2 commits into from
Nov 4, 2025
Merged

[#26] Fix selection multiline #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d051d7e
[#26] fix drawing of highlights as single fragment boxes for linux/qt5
kreuzberger Nov 4, 2025
6087b48
fix windows tests with single fragment comparison
kreuzberger Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/container_qt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,18 +1208,16 @@ void container_qt::draw_highlights( litehtml::uint_ptr hdc )
for ( auto it = mFindMatches.begin(); it != mFindMatches.end(); ++it )
{
const auto match = ( *it );
// for ( auto it = match.fragments.begin(); it != match.fragments.end(); ++it )
// {
// litehtml::position pos = ( *it ).pos;
// highlight_text_at_position( hdc, pos, match );
// }
litehtml::position pos = ( *it ).bounding_box;
highlight_text_at_position( hdc, pos, match );
for ( auto it = match.fragments.begin(); it != match.fragments.end(); ++it )
{
litehtml::position pos = ( *it ).pos;
highlight_text_at_position( hdc, pos, match );
}
}
}

// draw highlighted text at position
void container_qt::highlight_text_at_position( litehtml::uint_ptr hdc, const litehtml::position& pos, const TextManager::TextFindMatch& match )
void container_qt::highlight_text_at_position( litehtml::uint_ptr hdc, const litehtml::position& pos, const TextManager::TextFindMatch& /*match*/ )
{

// qDebug() << "Highlighting text '" << QString::fromStdString( match.matched_text ) << "' at position (" << pos.x << ", " << pos.y << ") with size
Expand Down
46 changes: 25 additions & 21 deletions test/library/test_find.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,22 @@ void FindTest::test_find_phrase_data()
{
QTest::addColumn<QString>( "find_text" );
QTest::addColumn<int>( "matches" );
QTest::addColumn<QList<QRect>>( "bounding_boxes" );
QTest::addColumn<QList<QList<QRect>>>( "bounding_boxes" );
#if defined( Q_OS_LINUX ) && QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
QList<QRect> boxes = { { 276, 909, 161, 15 } };
QList<QList<QRect>> boxes = { { { 276, 909, 66, 15 }, { 342, 909, 4, 15 }, { 346, 909, 91, 15 } } };
#else
QList<QRect> boxes = { { 276, 866, 161, 14 } };
QList<QList<QRect>> boxes = { { { 276, 866, 66, 14 }, { 342, 866, 4, 14 }, { 346, 866, 91, 14 } } };
#endif
QTest::addRow( "%d", 0 ) << QString( "allgemeine Beobachtungen" ) << 1 << boxes;
boxes = { { 0, 0, 0, 0 } };
boxes = { { {} } };
QTest::addRow( "%d", 0 ) << QString( "schliesst ab" ) << 0 << boxes;
}

void FindTest::test_find_phrase()
{
QFETCH( QString, find_text );
QFETCH( int, matches );
QFETCH( QList<QRect>, bounding_boxes );
QFETCH( QList<QList<QRect>>, bounding_boxes );

auto browser = createMainWindow( mBrowserSize );
// QVERIFY( mWnd->centralWidget() );
Expand All @@ -111,14 +111,12 @@ void FindTest::test_find_phrase()
for ( size_t i = 0; i < find_machtes.size(); ++i )
{
const auto& match = find_machtes[i];
auto bb = QRect( match.bounding_box.x, match.bounding_box.y, match.bounding_box.width, match.bounding_box.height );
if ( bb != bounding_boxes[i] )
for ( size_t j = 0; j < match.fragments.size(); ++j )
{
auto img = container->grab(); // QMainWindow, QWidget usw.
img.save( QString( "screenshot_ui_find_phrase_%1.png" ).arg( i ) );
auto bb =
QRect( ( match.fragments[j] ).pos.x, ( match.fragments[j] ).pos.y, ( match.fragments[j] ).pos.width, ( match.fragments[j] ).pos.height );
QCOMPARE( bb, bounding_boxes[i][j] );
}

QCOMPARE( bb, bounding_boxes[i] );
}
}
}
Expand All @@ -127,12 +125,20 @@ void FindTest::test_find_phrase_multi_element_data()
{
QTest::addColumn<QString>( "find_text" );
QTest::addColumn<int>( "matches" );
QTest::addColumn<QList<QRect>>( "bounding_boxes" );
QTest::addColumn<QList<QList<QRect>>>( "bounding_boxes" );
// these boxes are currently valid, but are wrong. See issues in qlitehtml project
#if defined( Q_OS_LINUX ) && QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
QList<QRect> boxes = { { 8, 1974, 143, 42 } };
QList<QList<QRect>> boxes = {
{ { 81, 1974, 47, 15 }, { 128, 1974, 4, 15 }, { 132, 1974, 19, 15 }, { 8, 2001, 40, 15 }, { 48, 2001, 4, 15 }, { 52, 2001, 12, 15 } } };
#else
QList<QRect> boxes = { { 8, 1880, 143, 40 } };
QList<QList<QRect>> boxes = { {
{ 81, 1880, 47, 14 },
{ 128, 1880, 4, 14 },
{ 132, 1880, 19, 14 },
{ 8, 1906, 40, 14 },
{ 48, 1906, 4, 14 },
{ 52, 1906, 12, 14 },
} };
#endif
QTest::addRow( "%d", 0 ) << QString( "schließt ab.Absatz 48" ) << 1 << boxes;
}
Expand All @@ -141,7 +147,7 @@ void FindTest::test_find_phrase_multi_element()
{
QFETCH( QString, find_text );
QFETCH( int, matches );
QFETCH( QList<QRect>, bounding_boxes );
QFETCH( QList<QList<QRect>>, bounding_boxes );

auto browser = createMainWindow( mBrowserSize );
// QVERIFY( mWnd->centralWidget() );
Expand All @@ -166,14 +172,12 @@ void FindTest::test_find_phrase_multi_element()
for ( size_t i = 0; i < find_machtes.size(); ++i )
{
const auto& match = find_machtes[i];
auto bb = QRect( match.bounding_box.x, match.bounding_box.y, match.bounding_box.width, match.bounding_box.height );
if ( bb != bounding_boxes[i] )
for ( size_t j = 0; j < match.fragments.size(); ++j )
{
auto img = container->grab(); // QMainWindow, QWidget usw.
img.save( QDir::currentPath() + QString( "/screenshot_ui_multi_element_%1.png" ).arg( i ) );
auto bb =
QRect( ( match.fragments[j] ).pos.x, ( match.fragments[j] ).pos.y, ( match.fragments[j] ).pos.width, ( match.fragments[j] ).pos.height );
QCOMPARE( bb, bounding_boxes[i][j] );
}

QCOMPARE( bb, bounding_boxes[i] );
}
}
}