From d6d6876013caf8118414a781af8842f74be29b78 Mon Sep 17 00:00:00 2001 From: Jason Conti Date: Sun, 9 May 2021 17:24:36 -0400 Subject: src/idoremovablemenuitem.c: replace grid with box to fix a11y --- src/idoremovablemenuitem.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/idoremovablemenuitem.c b/src/idoremovablemenuitem.c index 88d20ad..946ffb3 100644 --- a/src/idoremovablemenuitem.c +++ b/src/idoremovablemenuitem.c @@ -387,16 +387,14 @@ static void ido_removable_menu_item_init(IdoRemovableMenuItem *self) gtk_widget_set_valign(pPrivate->pButton, GTK_ALIGN_CENTER); gtk_widget_show(pPrivate->pButton); - GtkWidget *pWidget = gtk_grid_new(); - GtkGrid *pGrid = GTK_GRID(pWidget); - - gtk_grid_attach(pGrid, pPrivate->pImage, 0, 0, 1, 1); - gtk_grid_attach(pGrid, pPrivate->pLabel, 1, 0, 1, 1); - gtk_grid_attach(pGrid, pPrivate->pButton, 2, 0, 1, 1); + GtkWidget *pBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start(GTK_BOX(pBox), pPrivate->pImage, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(pBox), pPrivate->pLabel, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(pBox), pPrivate->pButton, FALSE, FALSE, 0); g_object_set(pPrivate->pImage, "halign", GTK_ALIGN_START, "hexpand", FALSE, "valign", GTK_ALIGN_CENTER, "margin-right", 6, NULL); g_object_set(pPrivate->pLabel, "halign", GTK_ALIGN_START, "hexpand", TRUE, "margin-right", 6, "valign", GTK_ALIGN_CENTER, NULL); - gtk_widget_show (pWidget); - gtk_container_add(GTK_CONTAINER(self), pWidget); + gtk_widget_show(pBox); + gtk_container_add(GTK_CONTAINER(self), pBox); g_signal_connect(pPrivate->pLabel, "activate-link", G_CALLBACK(onActivateLink), self); } -- cgit v1.2.3 From 287c8fc4f0e9644c2bb9568813fb225cea036c43 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 11 May 2021 17:12:32 +0200 Subject: debian/control: Adjust versioned B-D on cmake (3.13 as stated in CMakeLists.txt). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 78c5769..35be628 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Mike Gabriel Build-Depends: debhelper (>= 9), - cmake (>= 3.16), + cmake (>= 3.13), cmake-extras, lcov, gcovr, -- cgit v1.2.3 From 41d834903548424be7d0a60d3f1aac5b07280f22 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 4 May 2021 13:04:58 +0200 Subject: CMakeLists.txt: Move coverage report generation macro into basefolder's CMakeLists.txt file. With the previous approach, only coverage of the tests/ subfolder was reported (which always should be 100%). With this change, also coverage of the files in src/ is reported. --- CMakeLists.txt | 9 +++++++++ tests/CMakeLists.txt | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b039352..70b509f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,15 @@ if (ENABLE_TESTS) enable_testing() add_subdirectory(example) add_subdirectory(tests) + # coverage + if (ENABLE_COVERAGE) + find_package(CoverageReport) + ENABLE_COVERAGE_REPORT( + TARGETS "ayatana-ido3-0.4" + TESTS "gtest-menuitems" + FILTER /usr/include ${CMAKE_BINARY_DIR}/* + ) + endif() endif() # Display config info diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 39cde1f..a31f789 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,10 +23,3 @@ target_link_libraries("gtest-menuitems" ) add_test("gtest-menuitems" "gtest-menuitems") add_dependencies("gtest-menuitems" ayatana-ido3-0.4) - - -# coverage -if (ENABLE_COVERAGE) - find_package(CoverageReport) - ENABLE_COVERAGE_REPORT(TARGETS "gtest-menuitems" TESTS "gtest-menuitems") -endif() -- cgit v1.2.3