TnSb/wofi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #inner-box having weird behavior when margins are set

Browse Source
This commit is contained in:
Scoopta 2019-10-13 12:42:05 -07:00
parent 64348d4fb1
commit 44a8e79fd7
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/wofi.c
View File

@ -310,13 +310,33 @@ static void select_item(GtkFlowBox* flow_box, gpointer data) {
previous_selection = box; previous_selection = box;
} }
static GtkWidget* get_first_child(GtkContainer* container) {
GList* children = gtk_container_get_children(container);
GList* list = children;
GtkWidget* min_child = NULL;
int64_t x = INT64_MAX;
int64_t y = INT64_MAX;
for(; list->next != NULL; list = list->next) {
GtkWidget* child = list->data;
GtkAllocation alloc;
gtk_widget_get_allocation(child, &alloc);
if(alloc.x <= x && alloc.y <= y && alloc.x != -1 && alloc.y != -1 && alloc.width != 1 && alloc.height != 1) {
x = alloc.x;
y = alloc.y;
min_child = child;
}
}
g_list_free(children);
return min_child;
}
static void activate_search(GtkEntry* entry, gpointer data) { static void activate_search(GtkEntry* entry, gpointer data) {
(void) data; (void) data;
if(exec_search != NULL && exec_search()) { if(exec_search != NULL && exec_search()) {
execute_action(mode, gtk_entry_get_text(entry)); execute_action(mode, gtk_entry_get_text(entry));
} else { } else {
GtkFlowBoxChild* row = gtk_flow_box_get_child_at_pos(GTK_FLOW_BOX(inner_box), 0, 0); GtkWidget* child = get_first_child(GTK_CONTAINER(inner_box));
GtkWidget* box = gtk_bin_get_child(GTK_BIN(row)); GtkWidget* box = gtk_bin_get_child(GTK_BIN(child));
execute_action(mode, wofi_property_box_get_property(WOFI_PROPERTY_BOX(box), "action")); execute_action(mode, wofi_property_box_get_property(WOFI_PROPERTY_BOX(box), "action"));
} }
} }
@ -365,9 +385,9 @@ static gboolean key_press(GtkWidget* widget, GdkEvent* event, gpointer data) {
return FALSE; return FALSE;
} }
if(gtk_widget_has_focus(entry) || gtk_widget_has_focus(scroll)) { if(gtk_widget_has_focus(entry) || gtk_widget_has_focus(scroll)) {
GtkFlowBoxChild* child = gtk_flow_box_get_child_at_pos(GTK_FLOW_BOX(inner_box), 0, 0); GtkWidget* child = get_first_child(GTK_CONTAINER(inner_box));
gtk_widget_grab_focus(GTK_WIDGET(child)); gtk_widget_grab_focus(child);
gtk_flow_box_select_child(GTK_FLOW_BOX(inner_box), child); gtk_flow_box_select_child(GTK_FLOW_BOX(inner_box), GTK_FLOW_BOX_CHILD(child));
return TRUE; return TRUE;
} }
break; break;