Skip to content

Remove deprecated properties. #15898

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.

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

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions src/gui/guides.c
Original file line number Diff line number Diff line change
Expand Up @@ -878,11 +878,10 @@ static void _settings_autoshow_menu(GtkWidget *button, struct dt_iop_module_t *m
GtkWidget *popover = darktable.view_manager->guides_popover;
gtk_popover_set_relative_to(GTK_POPOVER(popover), button);

g_object_set(G_OBJECT(popover), "transitions-enabled", FALSE, NULL);

dt_guides_update_popover_values();

gtk_widget_show_all(popover);
// use popover_popup for transition and widget_show for not
gtk_widget_show(popover);
}

void dt_guides_init_module_widget(GtkWidget *iopw, struct dt_iop_module_t *module)
Expand Down
1 change: 0 additions & 1 deletion src/libs/filtering.c
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,6 @@ static void _topbar_show_pref_menu(dt_lib_module_t *self, GtkWidget *bt)

// initialize the popover
d->topbar_popup = gtk_popover_new(bt);
g_object_set(G_OBJECT(d->topbar_popup), "transitions-enabled", FALSE, NULL);

GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(d->topbar_popup), vbox);
Expand Down
2 changes: 0 additions & 2 deletions src/libs/tagging.c
Original file line number Diff line number Diff line change
Expand Up @@ -3116,7 +3116,6 @@ void gui_init(dt_lib_module_t *self)
renderer = gtk_cell_renderer_toggle_new();
gtk_tree_view_column_pack_start(col, renderer, TRUE);
gtk_tree_view_column_set_cell_data_func(col, renderer, _tree_select_show, NULL, NULL);
g_object_set(renderer, "indicator-size", 8, NULL); // too big by default

col = gtk_tree_view_column_new();
gtk_tree_view_append_column(view, col);
Expand Down Expand Up @@ -3230,7 +3229,6 @@ void gui_init(dt_lib_module_t *self)
gtk_tree_view_column_pack_start(col, renderer, TRUE);
gtk_cell_renderer_toggle_set_activatable(GTK_CELL_RENDERER_TOGGLE(renderer), TRUE);
gtk_tree_view_column_set_cell_data_func(col, renderer, _tree_select_show, NULL, NULL);
g_object_set(renderer, "indicator-size", 8, NULL); // too big by default

col = gtk_tree_view_column_new();
gtk_tree_view_append_column(view, col);
Expand Down
1 change: 0 additions & 1 deletion src/libs/tools/global_toolbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ void gui_init(dt_lib_module_t *self)
gtk_box_pack_start(GTK_BOX(self->widget), d->overlays_button, FALSE, FALSE, 0);
d->over_popup = gtk_popover_new(d->overlays_button);
gtk_widget_set_size_request(d->over_popup, 350, -1);
g_object_set(G_OBJECT(d->over_popup), "transitions-enabled", FALSE, NULL);
g_signal_connect(G_OBJECT(d->overlays_button), "clicked", G_CALLBACK(_overlays_show_popup), self);
// we register size of overlay icon to keep in sync thumbtable overlays
g_signal_connect(G_OBJECT(d->overlays_button), "size-allocate", G_CALLBACK(_main_icons_register_size), NULL);
Expand Down
16 changes: 12 additions & 4 deletions src/views/darkroom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1393,8 +1393,9 @@ static void _second_window_quickbutton_clicked(GtkWidget *w, dt_develop_t *dev)

/** toolbar buttons */

static gboolean _toolbar_show_popup(gpointer user_data)
static gboolean _toolbar_show_popup(gpointer user_data, gboolean transition)
{

GtkPopover *popover = GTK_POPOVER(user_data);

GtkWidget *button = gtk_popover_get_relative_to(popover);
Expand All @@ -1417,7 +1418,15 @@ static gboolean _toolbar_show_popup(gpointer user_data)
if(darktable.view_manager && GTK_WIDGET(popover) == darktable.view_manager->guides_popover)
dt_guides_update_popover_values();

gtk_widget_show_all(GTK_WIDGET(popover));
// decide to use transition or not
if (transition)
{
gtk_popover_popup(popover);
}
else
{
gtk_widget_show(GTK_WIDGET(popover));
}

// cancel glib timeout if invoked by long button press
return FALSE;
Expand Down Expand Up @@ -2137,9 +2146,8 @@ static gboolean _quickbutton_press_release(GtkWidget *button,
{
gtk_popover_set_relative_to(GTK_POPOVER(popover), button);

g_object_set(G_OBJECT(popover), "transitions-enabled", FALSE, NULL);
_toolbar_show_popup(popover, FALSE);

_toolbar_show_popup(popover);
return TRUE;
}
else
Expand Down
1 change: 0 additions & 1 deletion src/views/lighttable.c
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,6 @@ void gui_init(dt_view_t *self)
// and the popup window
lib->profile_floating_window = gtk_popover_new(profile_button);

g_object_set(G_OBJECT(lib->profile_floating_window), "transitions-enabled", FALSE, NULL);
g_signal_connect_swapped(G_OBJECT(profile_button), "button-press-event", G_CALLBACK(gtk_widget_show_all), lib->profile_floating_window);

GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
Expand Down