mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 14:34:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge d4a1ab7b86 into 4cfcb3643b

Browse Source
This commit is contained in:
mTvare 2024-11-04 19:04:31 +01:00 committed by GitHub
commit 0af65cf767
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/util.c
View File

@ -13,6 +13,10 @@ int wrap(int i, int max) {
return ((i % max) + max) % max; return ((i % max) + max) % max;
} }
int max(int a, int b){
return a > b ? a : b;
}
bool parse_color(const char *color, uint32_t *result) { bool parse_color(const char *color, uint32_t *result) {
if (color[0] == '#') { if (color[0] == '#') {
++color; ++color;

5
include/util.h
View File

@ -34,6 +34,11 @@ int parse_movement_amount(int argc, char **argv,
*/ */
int wrap(int i, int max); int wrap(int i, int max);
/**
* Returns maximum of a and b
*/
int max(int a, int b);
/** /**
* Given a string that represents an RGB(A) color, result will be set to a * Given a string that represents an RGB(A) color, result will be set to a
* uint32_t version of the color, as long as it is valid. If it is invalid, * uint32_t version of the color, as long as it is valid. If it is invalid,

7
sway/desktop/transaction.c
View File

@ -17,6 +17,7 @@
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "util.h"
struct sway_transaction { struct sway_transaction {
struct wl_event_source *timer; struct wl_event_source *timer;
@ -424,13 +425,13 @@ static void arrange_container(struct sway_container *con,
int border_bottom = con->current.border_bottom ? border_width : 0; int border_bottom = con->current.border_bottom ? border_width : 0;
int border_left = con->current.border_left ? border_width : 0; int border_left = con->current.border_left ? border_width : 0;
int border_right = con->current.border_right ? border_width : 0; int border_right = con->current.border_right ? border_width : 0;
int vert_border_height = max(0, height- border_top - border_bottom);
wlr_scene_rect_set_size(con->border.top, width, border_top); wlr_scene_rect_set_size(con->border.top, width, border_top);
wlr_scene_rect_set_size(con->border.bottom, width, border_bottom); wlr_scene_rect_set_size(con->border.bottom, width, border_bottom);
wlr_scene_rect_set_size(con->border.left, wlr_scene_rect_set_size(con->border.left,
border_left, height - border_top - border_bottom); border_left, vert_border_height);
wlr_scene_rect_set_size(con->border.right, wlr_scene_rect_set_size(con->border.right,
border_right, height - border_top - border_bottom); border_right, vert_border_height);
wlr_scene_node_set_position(&con->border.top->node, 0, 0); wlr_scene_node_set_position(&con->border.top->node, 0, 0);
wlr_scene_node_set_position(&con->border.bottom->node, wlr_scene_node_set_position(&con->border.bottom->node,