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

refactor(swappy): rename painting into settings

Browse Source
This commit is contained in:
Jeremy Attali 2020-01-01 15:21:36 -05:00
parent 7e8b2a4641
commit 49be066079
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/swappy.h
View File

@ -69,7 +69,7 @@ struct swappy_box {
int32_t height;
};
struct swappy_state_painting {
struct swappy_state_settings {
double r;
double g;
double b;
@ -167,7 +167,7 @@ struct swappy_state {
GList *redo_paints;
struct swappy_paint *temp_paint;
struct swappy_state_painting painting;
struct swappy_state_settings settings;
int argc;
char **argv;

38
src/application.c
View File

@ -24,7 +24,7 @@ static void update_ui_undo_redo(struct swappy_state *state) {
static void update_ui_stroke_size_widget(struct swappy_state *state) {
GtkButton *button = GTK_BUTTON(state->ui->stroke_size);
char label[255];
snprintf(label, 255, "%.0lf", state->painting.w);
snprintf(label, 255, "%.0lf", state->settings.w);
gtk_button_set_label(button, label);
}
@ -67,10 +67,10 @@ static void action_toggle_painting_pane(struct swappy_state *state) {
static void action_update_color_state(struct swappy_state *state, double r,
double g, double b, double a,
gboolean custom) {
state->painting.r = r;
state->painting.g = g;
state->painting.b = b;
state->painting.a = a;
state->settings.r = r;
state->settings.g = g;
state->settings.b = b;
state->settings.a = a;
gtk_widget_set_sensitive(GTK_WIDGET(state->ui->color), custom);
}
@ -104,29 +104,29 @@ static void switch_mode_to_arrow(struct swappy_state *state) {
}
static void action_stroke_size_decrease(struct swappy_state *state) {
guint step = state->painting.w <= 10 ? 1 : 5;
guint step = state->settings.w <= 10 ? 1 : 5;
state->painting.w -= step;
state->settings.w -= step;
if (state->painting.w < SWAPPY_STROKE_SIZE_MIN) {
state->painting.w = SWAPPY_STROKE_SIZE_MIN;
if (state->settings.w < SWAPPY_STROKE_SIZE_MIN) {
state->settings.w = SWAPPY_STROKE_SIZE_MIN;
}
update_ui_stroke_size_widget(state);
}
static void action_stroke_size_reset(struct swappy_state *state) {
state->painting.w = SWAPPY_STROKE_SIZE_DEFAULT;
state->settings.w = SWAPPY_STROKE_SIZE_DEFAULT;
update_ui_stroke_size_widget(state);
}
static void action_stroke_size_increase(struct swappy_state *state) {
guint step = state->painting.w >= 10 ? 5 : 1;
state->painting.w += step;
guint step = state->settings.w >= 10 ? 5 : 1;
state->settings.w += step;
if (state->painting.w > SWAPPY_STROKE_SIZE_MAX) {
state->painting.w = SWAPPY_STROKE_SIZE_MAX;
if (state->settings.w > SWAPPY_STROKE_SIZE_MAX) {
state->settings.w = SWAPPY_STROKE_SIZE_MAX;
}
update_ui_stroke_size_widget(state);
@ -615,11 +615,11 @@ bool application_init(struct swappy_state *state) {
g_signal_connect(state->app, "command-line", G_CALLBACK(command_line_handler),
state);
state->painting.r = 1;
state->painting.g = 0;
state->painting.b = 0;
state->painting.a = 1;
state->painting.w = SWAPPY_STROKE_SIZE_DEFAULT;
state->settings.r = 1;
state->settings.g = 0;
state->settings.b = 0;
state->settings.a = 1;
state->settings.w = SWAPPY_STROKE_SIZE_DEFAULT;
return true;
}

10
src/paint.c
View File

@ -36,11 +36,11 @@ void paint_add_temporary(struct swappy_state *state, double x, double y,
struct swappy_paint *paint = g_new(struct swappy_paint, 1);
struct swappy_point *brush;
double r = state->painting.r;
double g = state->painting.g;
double b = state->painting.b;
double a = state->painting.a;
double w = state->painting.w;
double r = state->settings.r;
double g = state->settings.g;
double b = state->settings.b;
double a = state->settings.a;
double w = state->settings.w;
paint->type = type;