implement mininum width for notification

fixes #69

Author: sewnie

config.c

@@ -68,6 +68,7 @@ void finish_config(struct mako_config *config) {
 }
 
 void init_default_style(struct mako_style *style) {
+	style->min_width = 0;
 	style->width = 300;
 	style->height = 100;
 
@@ -223,6 +224,11 @@ bool apply_style(struct mako_style *target, const struct mako_style *style) {
 
 	// Now on to actually setting things!
 
+	if (style->spec.width) {
+		target->min_width = style->min_width;
+		target->spec.min_width = true;
+	}
+
 	if (style->spec.width) {
 		target->width = style->width;
 		target->spec.width = true;
@@ -411,6 +417,7 @@ bool apply_style(struct mako_style *target, const struct mako_style *style) {
 bool apply_superset_style(
 		struct mako_style *target, struct mako_config *config) {
 	// Specify eveything that we'll be combining.
+	target->spec.min_width = true;
 	target->spec.width = true;
 	target->spec.height = true;
 	target->spec.outer_margin = true;
@@ -441,6 +448,7 @@ bool apply_superset_style(
 		// We can cheat and skip checking whether any of these are specified,
 		// since we're looking for the max and unspecified ones will be
 		// initialized to zero.
+		target->min_width = max(style->min_width, target->min_width);
 		target->width = max(style->width, target->width);
 		target->height = max(style->height, target->height);
 		target->outer_margin.top = max(style->outer_margin.top, target->outer_margin.top);
@@ -566,6 +574,8 @@ static bool apply_style_option(struct mako_style *style, const char *name,
 			parse_color(value, &style->colors.background);
 	} else if (strcmp(name, "text-color") == 0) {
 		return spec->colors.text = parse_color(value, &style->colors.text);
+	} else if (strcmp(name, "min-width") == 0) {
+		return spec->min_width = parse_int_ge(value, &style->min_width, 1);
 	} else if (strcmp(name, "width") == 0) {
 		return spec->width = parse_int_ge(value, &style->width, 1);
 	} else if (strcmp(name, "height") == 0) {
@@ -901,6 +911,7 @@ int parse_config_arguments(struct mako_config *config, int argc, char **argv) {
 		{"text-color", required_argument, 0, 0},
 		{"width", required_argument, 0, 0},
 		{"height", required_argument, 0, 0},
+		{"min-width", required_argument, 0, 0},
 		{"outer-margin", required_argument, 0, 0},
 		{"margin", required_argument, 0, 0},
 		{"padding", required_argument, 0, 0},

doc/mako.5.scd

@@ -138,6 +138,14 @@ Supported actions:
 
 	Default: 300
 
+*min-width*=_px_
+	Set mininum (dynamic) width of notification popups.
+	The normal width of notifications will be considered
+	the maximum notification width.
+	Set to 0 to disable.
+
+	Default: 0
+
 *height*=_px_
 	Set maximum height of notification popups. Notifications whose text takes
 	up less space are shrunk to fit.

include/config.h

@@ -39,7 +39,7 @@ enum mako_icon_location {
 // fields in the mako_style structure should have a counterpart here. Inline
 // structs are also mirrored.
 struct mako_style_spec {
-	bool width, height, outer_margin, margin, padding, border_size, border_radius, font,
+	bool width, min_width, height, outer_margin, margin, padding, border_size, border_radius, font,
 		markup, format, text_alignment, actions, default_timeout, ignore_timeout,
 		icons, max_icon_size, icon_path, icon_border_radius, group_criteria_spec, invisible, history,
 		icon_location, max_visible, layer, output, anchor;
@@ -57,6 +57,7 @@ struct mako_style {
 	struct mako_style_spec spec;
 
 	int32_t width;
+	int32_t min_width;
 	int32_t height;
 	struct mako_directional outer_margin;
 	struct mako_directional margin;

main.c

@@ -21,6 +21,9 @@ static const char usage[] =
 	"      --text-color <color>            Text color.\n"
 	"      --width <px>                    Notification width.\n"
 	"      --height <px>                   Max notification height.\n"
+	"      --min-width <px>                Minimum notification width, with\n"
+	"                                      the normal notification width acting\n"
+	"                                      as the maximum.\n"
 	"      --outer-margin <px>[,<px>...]   Outer margin values, comma separated.\n"
 	"                                      Up to four values, with the same\n"
 	"                                      meaning as in CSS.\n"

render.c

@@ -113,16 +113,6 @@ static int render_notification(cairo_t *cairo, struct mako_state *state, struct
 	int notif_width =
 		(style->width <= surface->width) ? style->width : surface->width;
 
-	// offset_x is for the entire draw operation inside the surface
-	int offset_x;
-	if (surface->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) {
-		offset_x = surface->width - notif_width - style->margin.right;
-	} else if (surface->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) {
-		offset_x = style->margin.left;
-	} else { // CENTER has nothing to & with, so it's the else case
-		offset_x = (surface->width - notif_width) / 2;
-	}
-
 	// text_x is the offset of the text inside our draw operation
 	double text_x = style->padding.left;
 	if (icon != NULL && style->icon_location == MAKO_ICON_LOCATION_LEFT) {
@@ -191,6 +181,27 @@ static int render_notification(cairo_t *cairo, struct mako_state *state, struct
 	int text_height = buffer_text_height / scale;
 	int text_width = buffer_text_width / scale;
 
+	if (style->min_width > 0) {
+		int min_width = text_width + border_size + padding_width;
+		if (icon && ! icon_vertical) {
+			min_width += icon->width;
+			min_width += style->icon_location == MAKO_ICON_LOCATION_LEFT ?
+				style->padding.left : style->padding.right;
+		}
+	
+		notif_width = MAX(style->min_width, min_width);
+	}
+	
+	// offset_x is for the entire draw operation inside the surface
+	int offset_x;
+	if (surface->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) {
+		offset_x = surface->width - notif_width - style->margin.right;
+	} else if (surface->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) {
+		offset_x = style->margin.left;
+	} else { // CENTER has nothing to & with, so it's the else case
+		offset_x = (surface->width - notif_width) / 2;
+	}
+
 	if (text_height > text_layout_height) {
 		text_height = text_layout_height;
 	}