summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-08-01 13:47:30 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-08-01 13:47:30 +0100
commitfa0608b50fb641517fd4cb51d93a734d47931658 (patch)
treeb797ee3383dd44a23e38b06a23650bad6f8419a4 /src/modules
parentf3af041f95c3b23e5fd9802b20a187a128cb9a57 (diff)
tiling - use a tiling specific border if it exists in theme and cfg
if you set cfg not ot use nomral borders then use "tiling" if it exists instead of "pixel" as thats probably the right thing to do...
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/tiling/e_mod_tiling.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index a0e33f2..62c6e29 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -567,24 +567,23 @@ _desk_config_apply(E_Desk *d, int old_nb_stacks, int new_nb_stacks)
567static void 567static void
568_client_apply_settings(E_Client *ec, Client_Extra *extra) 568_client_apply_settings(E_Client *ec, Client_Extra *extra)
569{ 569{
570 if (!extra) 570 const char *bdname = "pixel";
571 {
572 extra = tiling_entry_func(ec);
573 }
574 571
575 if (!extra || !extra->tiled) 572 if (!extra) extra = tiling_entry_func(ec);
576 return;
577 573
578 if (ec->maximized) 574 if ((!extra) || (!extra->tiled)) return;
579 _e_client_unmaximize(ec, E_MAXIMIZE_BOTH); 575
576 if (ec->maximized) _e_client_unmaximize(ec, E_MAXIMIZE_BOTH);
580 577
581 if (!tiling_g.config->show_titles && (!ec->bordername || 578 if (e_theme_border_find("tiling")) bdname = "tiling";
582 strcmp(ec->bordername, "pixel")))
583 change_window_border(ec, "pixel");
584 else if (tiling_g.config->show_titles && (ec->bordername &&
585 !strcmp(ec->bordername, "pixel")))
586 change_window_border(ec, (extra->orig.bordername) ? extra->orig.bordername : "default");
587 579
580 if ((!tiling_g.config->show_titles) &&
581 (!ec->bordername || strcmp(ec->bordername, bdname)))
582 change_window_border(ec, bdname);
583 else if ((tiling_g.config->show_titles) &&
584 (ec->bordername && !strcmp(ec->bordername, bdname)))
585 change_window_border(ec, (extra->orig.bordername) ?
586 extra->orig.bordername : "default");
588} 587}
589 588
590static void 589static void