Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add transparency feature #164

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add transparency feature #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57377d8
feat(ui): add transparency feature
kadamski Nov 5, 2024
f2b703c
feat(ui): make transparency configurable
kadamski Nov 6, 2024
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
6 changes: 6 additions & 0 deletions include/application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,9 @@ void stroke_size_increase_handler(GtkWidget *widget,
void text_size_decrease_handler(GtkWidget *widget, struct swappy_state *state);
void text_size_reset_handler(GtkWidget *widget, struct swappy_state *state);
void text_size_increase_handler(GtkWidget *widget, struct swappy_state *state);

void transparency_decrease_handler(GtkWidget *widget,
struct swappy_state *state);
void transparency_reset_handler(GtkWidget *widget, struct swappy_state *state);
void transparency_increase_handler(GtkWidget *widget,
struct swappy_state *state);
2 changes: 2 additions & 0 deletions include/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
#define CONFIG_LINE_SIZE_DEFAULT 5
#define CONFIG_TEXT_FONT_DEFAULT "sans-serif"
#define CONFIG_TEXT_SIZE_DEFAULT 20
#define CONFIG_TRANSPARENCY_DEFAULT 50
#define CONFIG_SHOW_PANEL_DEFAULT false
#define CONFIG_SAVE_FILENAME_FORMAT_DEFAULT "swappy-%Y%m%d_%H%M%S.png"
#define CONFIG_PAINT_MODE_DEFAULT SWAPPY_PAINT_MODE_BRUSH
#define CONFIG_EARLY_EXIT_DEFAULT false
#define CONFIG_FILL_SHAPE_DEFAULT false
#define CONFIG_AUTO_SAVE_DEFAULT false
#define CONFIG_CUSTOM_COLOR_DEFAULT "rgba(193,125,17,1)"
#define CONFIG_TRANSPARENT_DEFAULT false

void config_load(struct swappy_state *state);
void config_free(struct swappy_state *state);
10 changes: 10 additions & 0 deletions include/swappy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
#define SWAPPY_TEXT_SIZE_MIN 10
#define SWAPPY_TEXT_SIZE_MAX 50

#define SWAPPY_TRANSPARENCY_MIN 5
#define SWAPPY_TRANSPARENCY_MAX 95

enum swappy_paint_type {
SWAPPY_PAINT_MODE_BRUSH = 0, /* Brush mode to draw arbitrary shapes */
SWAPPY_PAINT_MODE_TEXT, /* Mode to draw texts */
Expand Down Expand Up @@ -106,6 +109,7 @@ struct swappy_state_settings {
double a;
double w;
double t;
int32_t tr;
};

struct swappy_state_ui {
Expand Down Expand Up @@ -137,8 +141,12 @@ struct swappy_state_ui {

GtkButton *line_size;
GtkButton *text_size;
GtkButton *transparency;
GtkButton *transparency_plus;
GtkButton *transparency_minus;

GtkToggleButton *fill_shape;
GtkToggleButton *transparent;
};

struct swappy_config {
Expand All @@ -147,9 +155,11 @@ struct swappy_config {
char *save_filename_format;
gint8 paint_mode;
gboolean fill_shape;
gboolean transparent;
gboolean show_panel;
guint32 line_size;
guint32 text_size;
guint32 transparency;
char *text_font;
gboolean early_exit;
gboolean auto_save;
Expand Down
94 changes: 93 additions & 1 deletion res/swappy.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
<property name="can_focus">False</property>
<property name="icon_name">zoom-out-symbolic</property>
</object>
<object class="GtkImage" id="zoom-out2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">zoom-out-symbolic</property>
</object>
<object class="GtkApplicationWindow" id="paint-window">
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand Down Expand Up @@ -582,6 +587,76 @@
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">10</property>
<property name="spacing">2</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Transparency</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="transparency-minus-button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">zoom-out2</property>
<property name="always-show-image">True</property>
<signal name="clicked" handler="transparency_decrease_handler" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="transparency-button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="always-show-image">True</property>
<signal name="clicked" handler="transparency_reset_handler" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="transparency-plus-button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">zoom-in2</property>
<property name="always-show-image">True</property>
<signal name="clicked" handler="transparency_increase_handler" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
Expand All @@ -604,11 +679,28 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="transparent-toggle-button">
<property name="label" translatable="yes">Transparent</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Toggle transparency</property>
<property name="always-show-image">True</property>
<signal name="toggled" handler="transparent_toggled_handler" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
<property name="position">6</property>
</packing>
</child>
</object>
Expand Down
91 changes: 91 additions & 0 deletions src/application.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <glib-2.0/glib.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <inttypes.h>
#include <stdio.h>
#include <time.h>

Expand Down Expand Up @@ -36,6 +37,13 @@ static void update_ui_text_size_widget(struct swappy_state *state) {
gtk_button_set_label(button, label);
}

static void update_ui_transparency_widget(struct swappy_state *state) {
GtkButton *button = GTK_BUTTON(state->ui->transparency);
char label[255];
g_snprintf(label, 255, "%" PRId32, state->settings.tr);
gtk_button_set_label(button, label);
}

static void update_ui_panel_toggle_button(struct swappy_state *state) {
GtkWidget *painting_box = GTK_WIDGET(state->ui->painting_box);
GtkToggleButton *button = GTK_TOGGLE_BUTTON(state->ui->panel_toggle_button);
Expand All @@ -52,6 +60,16 @@ static void update_ui_fill_shape_toggle_button(struct swappy_state *state) {
gtk_toggle_button_set_active(button, toggled);
}

static void update_ui_transparent_toggle_button(struct swappy_state *state) {
GtkToggleButton *button = GTK_TOGGLE_BUTTON(state->ui->transparent);
gboolean toggled = state->config->transparent;

gtk_toggle_button_set_active(button, toggled);
gtk_widget_set_sensitive(GTK_WIDGET(state->ui->transparency), toggled);
gtk_widget_set_sensitive(GTK_WIDGET(state->ui->transparency_minus), toggled);
gtk_widget_set_sensitive(GTK_WIDGET(state->ui->transparency_plus), toggled);
}

void application_finish(struct swappy_state *state) {
g_debug("application finishing, cleaning up");
paint_free_all(state);
Expand Down Expand Up @@ -215,6 +233,38 @@ static void action_text_size_increase(struct swappy_state *state) {
update_ui_text_size_widget(state);
}

static void action_transparency_decrease(struct swappy_state *state) {
state->settings.tr -= 10;

if (state->settings.tr < SWAPPY_TRANSPARENCY_MIN) {
state->settings.tr = SWAPPY_TRANSPARENCY_MIN;
} else {
// ceil to 10
state->settings.tr += 5;
state->settings.tr /= 10;
state->settings.tr *= 10;
}

update_ui_transparency_widget(state);
}
static void action_transparency_reset(struct swappy_state *state) {
state->settings.tr = state->config->transparency;
update_ui_transparency_widget(state);
}
static void action_transparency_increase(struct swappy_state *state) {
state->settings.tr += 10;

if (state->settings.tr > SWAPPY_TRANSPARENCY_MAX) {
state->settings.tr = SWAPPY_TRANSPARENCY_MAX;
} else {
// floor to 10
state->settings.tr /= 10;
state->settings.tr *= 10;
}

update_ui_transparency_widget(state);
}

static void action_fill_shape_toggle(struct swappy_state *state,
gboolean *toggled) {
// Don't allow changing the state via a shortcut if the button can't be
Expand All @@ -227,6 +277,14 @@ static void action_fill_shape_toggle(struct swappy_state *state,
update_ui_fill_shape_toggle_button(state);
}

static void action_transparent_toggle(struct swappy_state *state,
gboolean *toggled) {
gboolean toggle = (toggled == NULL) ? !state->config->transparent : *toggled;
state->config->transparent = toggle;

update_ui_transparent_toggle_button(state);
}

static void save_state_to_file_or_folder(struct swappy_state *state,
char *file) {
GdkPixbuf *pixbuf = pixbuf_get_from_state(state);
Expand Down Expand Up @@ -437,6 +495,9 @@ void window_keypress_handler(GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_f:
action_fill_shape_toggle(state, NULL);
break;
case GDK_KEY_T:
action_transparent_toggle(state, NULL);
break;
default:
break;
}
Expand Down Expand Up @@ -641,12 +702,31 @@ void text_size_increase_handler(GtkWidget *widget, struct swappy_state *state) {
action_text_size_increase(state);
}

void transparency_decrease_handler(GtkWidget *widget,
struct swappy_state *state) {
action_transparency_decrease(state);
}
void transparency_reset_handler(GtkWidget *widget, struct swappy_state *state) {
action_transparency_reset(state);
}
void transparency_increase_handler(GtkWidget *widget,
struct swappy_state *state) {
action_transparency_increase(state);
}

void fill_shape_toggled_handler(GtkWidget *widget, struct swappy_state *state) {
GtkToggleButton *button = GTK_TOGGLE_BUTTON(widget);
gboolean toggled = gtk_toggle_button_get_active(button);
action_fill_shape_toggle(state, &toggled);
}

void transparent_toggled_handler(GtkWidget *widget,
struct swappy_state *state) {
GtkToggleButton *button = GTK_TOGGLE_BUTTON(widget);
gboolean toggled = gtk_toggle_button_get_active(button);
action_transparent_toggle(state, &toggled);
}

static void compute_window_size_and_scaling_factor(struct swappy_state *state) {
GdkRectangle workarea = {0};
GdkDisplay *display = gdk_display_get_default();
Expand Down Expand Up @@ -783,12 +863,20 @@ static bool load_layout(struct swappy_state *state) {
GTK_BUTTON(gtk_builder_get_object(builder, "stroke-size-button"));
state->ui->text_size =
GTK_BUTTON(gtk_builder_get_object(builder, "text-size-button"));
state->ui->transparency =
GTK_BUTTON(gtk_builder_get_object(builder, "transparency-button"));
state->ui->transparency_plus =
GTK_BUTTON(gtk_builder_get_object(builder, "transparency-plus-button"));
state->ui->transparency_minus =
GTK_BUTTON(gtk_builder_get_object(builder, "transparency-minus-button"));

state->ui->fill_shape = GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "fill-shape-toggle-button"));

gdk_rgba_parse(&color, state->config->custom_color);
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(state->ui->color), &color);
state->ui->transparent = GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "transparent-toggle-button"));

state->ui->brush = brush;
state->ui->text = text;
Expand Down Expand Up @@ -859,9 +947,11 @@ static bool init_gtk_window(struct swappy_state *state) {

update_ui_stroke_size_widget(state);
update_ui_text_size_widget(state);
update_ui_transparency_widget(state);
update_ui_undo_redo(state);
update_ui_panel_toggle_button(state);
update_ui_fill_shape_toggle_button(state);
update_ui_transparent_toggle_button(state);

return true;
}
Expand All @@ -881,6 +971,7 @@ static void init_settings(struct swappy_state *state) {
state->settings.a = 1;
state->settings.w = state->config->line_size;
state->settings.t = state->config->text_size;
state->settings.tr = state->config->transparency;
state->mode = state->config->paint_mode;
}

Expand Down
Loading
Loading