alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:SirCmpwn/sway into fix-swaybar-in-08bef67

Browse source
This commit is contained in:
Zandr Martin 2016-05-31 09:30:34 -05:00
parent 1b4d61662c df8caa29a7
commit 8a81f52450
5 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/config.h
View file

@ -226,6 +226,12 @@ struct sway_config {
struct border_colors placeholder;
uint32_t background;
} border_colors;
// floating view minimum
int32_t floating_maximum_width;
int32_t floating_maximum_height;
int32_t floating_minimum_width;
int32_t floating_minimum_height;
};
/**

2
include/container.h
View file

@ -168,6 +168,8 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle);
*/
swayc_t *new_floating_view(wlc_handle handle);
void floating_view_sane_size(swayc_t *view);
/**
* Frees an output's container.
*/

6
sway/config.c
View file

@ -172,6 +172,12 @@ static void config_defaults(struct sway_config *config) {
config->font = strdup("monospace 10");
config->font_height = get_font_text_height(config->font);
// floating view
config->floating_maximum_width = -1;
config->floating_maximum_height = -1;
config->floating_minimum_width = 75;
config->floating_minimum_height = 50;
// Flags
config->focus_follows_mouse = true;
config->mouse_warping = true;

25
sway/container.c
View file

@ -328,6 +328,31 @@ swayc_t *new_floating_view(wlc_handle handle) {
return view;
}
void floating_view_sane_size(swayc_t *view) {
if (config->floating_minimum_height != -1 &&
view->desired_height < config->floating_minimum_height) {
view->desired_height = config->floating_minimum_height;
}
if (config->floating_minimum_width != -1 &&
view->desired_width < config->floating_minimum_width) {
view->desired_width = config->floating_minimum_width;
}
if (config->floating_maximum_height != -1 &&
view->desired_height > config->floating_maximum_height) {
view->desired_height = config->floating_maximum_height;
}
if (config->floating_maximum_width != -1 &&
view->desired_width > config->floating_maximum_width) {
view->desired_width = config->floating_maximum_width;
}
sway_log(L_DEBUG, "Sane values for view to %d x %d @ %.f, %.f",
view->desired_width, view->desired_height, view->x, view->y);
return;
}
// Destroy container
swayc_t *destroy_output(swayc_t *output) {

1
sway/handlers.c
View file

@ -350,6 +350,7 @@ static void handle_view_geometry_request(wlc_handle handle, const struct wlc_geo
view->desired_height = geometry->size.h;
if (view->is_floating) {
floating_view_sane_size(view);
view->width = view->desired_width;
view->height = view->desired_height;
view->x = geometry->origin.x;