jtheoof/swappy
1
1
Fork 0
mirror of https://github.com/jtheoof/swappy.git synced 2024-08-17 02:30:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore(format): fix clang-format

Browse Source
This commit is contained in:
Jeremy Attali 2022-11-18 16:20:18 -05:00
parent d6b2db1703
commit 6d9ae725a8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/application.c
View File

@ -215,10 +215,11 @@ static void action_text_size_increase(struct swappy_state *state) {
update_ui_text_size_widget(state); update_ui_text_size_widget(state);
} }
static void action_fill_shape_toggle(struct swappy_state *state, gboolean *toggled) { static void action_fill_shape_toggle(struct swappy_state *state,
// Don't allow changing the state via a shortcut if the button can't be clicked. gboolean *toggled) {
if(!gtk_widget_get_sensitive(GTK_WIDGET(state->ui->fill_shape))) // Don't allow changing the state via a shortcut if the button can't be
return; // clicked.
if (!gtk_widget_get_sensitive(GTK_WIDGET(state->ui->fill_shape))) return;
gboolean toggle = (toggled == NULL) ? !state->config->fill_shape : *toggled; gboolean toggle = (toggled == NULL) ? !state->config->fill_shape : *toggled;
state->config->fill_shape = toggle; state->config->fill_shape = toggle;
@ -781,8 +782,8 @@ static bool load_layout(struct swappy_state *state) {
state->ui->text_size = state->ui->text_size =
GTK_BUTTON(gtk_builder_get_object(builder, "text-size-button")); GTK_BUTTON(gtk_builder_get_object(builder, "text-size-button"));
state->ui->fill_shape = state->ui->fill_shape = GTK_TOGGLE_BUTTON(
GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "fill-shape-toggle-button")); gtk_builder_get_object(builder, "fill-shape-toggle-button"));
state->ui->brush = brush; state->ui->brush = brush;
state->ui->text = text; state->ui->text = text;
@ -814,7 +815,8 @@ static void set_paint_mode(struct swappy_state *state) {
gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false); gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), false);
break; break;
case SWAPPY_PAINT_MODE_RECTANGLE: case SWAPPY_PAINT_MODE_RECTANGLE:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->rectangle), true); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(state->ui->rectangle),
true);
gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), true); gtk_widget_set_sensitive(GTK_WIDGET(state->ui->fill_shape), true);
break; break;
case SWAPPY_PAINT_MODE_ELLIPSE: case SWAPPY_PAINT_MODE_ELLIPSE:

1
src/config.c
View File

@ -232,7 +232,6 @@ static void load_config_from_file(struct swappy_config *config,
error = NULL; error = NULL;
} }
g_key_file_free(gkf); g_key_file_free(gkf);
} }