From 93afb6e1552c0f957a9f79881d9a9f70ade885eb Mon Sep 17 00:00:00 2001 From: thewaiter Date: Sun, 12 Apr 2020 13:03:36 +0200 Subject: [PATCH] Double sided border controls --- MokshaMoonlight/bd_top_over_left.png | Bin 0 -> 499 bytes MokshaMoonlight/border.edc | 167 +++++++++++++++++++++++++++ MokshaMoonlight/default.edc | 1 + 3 files changed, 168 insertions(+) create mode 100644 MokshaMoonlight/bd_top_over_left.png diff --git a/MokshaMoonlight/bd_top_over_left.png b/MokshaMoonlight/bd_top_over_left.png new file mode 100644 index 0000000000000000000000000000000000000000..0656941d6645e61b20e76f03705f9848be553dad GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0y~yV0-~&i*v96$peq?lmID~VkgfK4j`!ENa+A7Smo*B z7*cWT?OppU=|F+wAMaQHc0ba4P{BZ=rh(P@z|_?tjWP$=4W1~hW66tI5%Q4xg~&d~ zcN6s<9GUbr?O1COd;j$J&)H6E?>qD6)yj-#+it&|KE1wu{;H>DO8c%w`Li-O6s4Zy z-(FW0rRVkk&egoG2}&`72UjvPOgg@E#r&_#`)($elvfj12Qn=cvE1*WW!mPvUsmnyrisELOc~WtaIU_36*I%w%9_Jg0DH zeQ1}HP$e6KzzY-Ml9+b+%V)Zz85|Y}N30F=Uj5YO$niu52Bx{`Rblp_o_XgunHe}r zW;yJ?dG%4s1olR-wnbU5vX(D81lD$$<(6sdk+WbuULUnJpPT~=2k+Qlzhg~u{jsm} zK&G82F#31lfBAV9DTWV`XJ4H+3VZ!EsQSO^%R^^4Oc)wCe<|CpGrynG{{HNvbKQDT z*+s?cey{*t*e`N%UhJfqD@}zj8#6RGsDJpiYw~XS`mm=y=Rn3D%G>{31>{NTYd1ms h3Bnl+2hQwa4w`d7;@X$VslZrd@O1TaS?83{1OOyZ*VF(2 literal 0 HcmV?d00001 diff --git a/MokshaMoonlight/border.edc b/MokshaMoonlight/border.edc index 1ef79ea..ba59f7e 100644 --- a/MokshaMoonlight/border.edc +++ b/MokshaMoonlight/border.edc @@ -339,6 +339,33 @@ part { \ } \ } +#define E_EVENT_ICON_LEFT(NAME, TO1, TO2) \ +part { \ + name: NAME; \ + type: RECT; \ + mouse_events: 1; \ + \ + description { \ + state: "default" 0.0; \ + align: 0.0 0.5; \ + aspect: 1.0 1.0; \ + aspect_preference: VERTICAL; \ + color: 255 255 255 0; \ + visible: 1; \ + \ + rel1 { \ + to: TO1; \ + offset: 5 3; \ + relative: 1 0; \ + } \ + \ + rel2 { \ + to: TO2; \ + relative: 1 1; \ + } \ + } \ +} + #define CLIPS(NAME, MIN, MAX, TO, REL1, OFF1, REL2, OFF2) \ part { \ name: NAME; \ @@ -835,6 +862,146 @@ group { } } +group { + name: "e/widgets/border/left/border"; + alias: "e/widgets/border/shaped/border"; + + data { + item: "shadow" "1"; + } + + parts { + SHADOW_PART("top-left", -9 -10, "bottom-right", 9 10) + BORDER("top-left", 6 23, 6 23, 0.0 0.0, 3 22, 0.0 0.0, 3 0, "bd_top_left.png", 0.0 0.0, 0.0 0.0, 3 22) + BORDER("top-right", 6 23, 6 23, 1.0 0.0, 0 22, 1.0 0.0, -6 0, "bd_top_right.png", 1.0 0.0, 1.0 0.0, 0 22) + BORDER4("bottom-left", 5 5, 5 5, 0.0 1.0, 3 -6, 0.0 1.0, 3 0, "bd_bottom_left.png", 0.0 1.0, 0.0 1.0, 5 -6, 1 5) + BORDER4("bottom-right", 5 5, 5 5, 1.0 1.0, 0 -6, 1.0 1.0, -6 0, "bd_bottom_right.png", 1.0 1.0, 1.0 1.0, 0 -6, 1 5) + BORDER2("left-border", "top-left", 0.0 1.0, 0 0, "bottom-left", 0.0 0.0, 0 0) + BORDER2("right-border", "top-right", 1.0 1.0, -1 0, "bottom-right", 1.0 0.0, 0 0 ) + BORDER3("top-center", 5 23, 9999 23, "top-left", 1.0 0.5, 0 0, "top-right", 0.0 0.5, -1 -2, "bd_top.png", 1.0 0.5, 0.0 0.5, 0 0) + BORDER3("bottom-center", 5 5, 9999 5, "bottom-left", 1.0 1.0, 0 -6, "bottom-right", 0.0 1.0, -1 0, "bd_bottom.png", 1.0 1.0, 0.0 1.0, 0 -6) + E_SWALLOW_CLIENT("e.swallow.client", "top-left", 0.0 1.0, 1 0, "bottom-right", 1.0 1.0, -2 -6) + TITLE_CLIP("title.area.clip", 1 20, "min-clip", 1.0 0.5, 10 0, "top-right", 1.0 0.5, -30 0, 255 255 255 255) + part { name: "e.text.title"; + type: TEXT; + effect: SOFT_SHADOW BOTTOM; + mouse_events: 0; + clip_to: "title.area.clip"; + scale: 1; + + description { + state: "default" 0.0; + color: 255 255 255 255; + color3: 255 255 255 255; + color_class: "border_title"; + rel1 { + to: "title.area.clip"; + relative: 0.0 0.5; + offset: 0 4; + } + + rel2 { + to: "title.area.clip"; + relative: 1.0 0.5; + offset: -5 0; + } + + text { + text: ""; + font: "Sans"; + size: 10; + min: 0 1; + align: 0.5 0.5; + text_class: "title_bar"; + } + visible: 0; + } + + description { + state: "default" 0.1; + inherit: "default" 0.0; + visible: 1; + } + } + BORDER("top-left-over", 6 23, 6 23, 0.0 0.0, 3 22, 0.0 0.0, 3 0, "bd_top_lefts.png", 0.0 0.0, 0.0 0.0, 3 22) + BORDER("top-right-over", 6 23, 6 23, 1.0 0.0, 0 22, 1.0 0.0, -6 0, "bd_top_right_over.png", 1.0 1.0, 1.0 0.0, -5 23) + BORDER3("top-center-over", 5 23, 9999 23, "top-left", 1.0 0.5, 0 0, "top-right", 0.0 0.5, -1 -2, "bd_top_over_left.png", 1.0 1.0, 0.0 1.0, -1 -2) + + MOVE_WINDOW("move-window", 1 22, 9999 22, "top-left", 0.0 0.0, 5 2, "top-right", 1.0 1.0, -7 -1, 255 0 0 0) + PART_EVENT_MAP("e.event.resize.t", 0, "resize_t") + PART_EVENT_MAP("e.event.titlebar", 0, "move-window") + PART_EVENT_MAP("e.event.resize.r", 0, "right-border") + PART_EVENT_MAP("e.event.resize.l", 0, "left-border") + PART_EVENT_MAP("e.event.resize.br", 0, "bottom-right") + PART_EVENT_MAP("e.event.resize.bl", 0, "bottom-left") + PART_EVENT_MAP("e.event.resize.b", 0, "bottom-center") + PART_EVENT_MAP("e.event.resize.tr", 0, "top-right") + PART_EVENT_MAP("e.event.resize.tl", 0, "top-left") + CLIPS("close-clip", 20 18, 20 18, "top-left", 0.0 0.0, 0 0, 0.0 1.0, 30 -8) + CLIPS("max-clip", 20 18, 20 18, "close-clip", 1.0 0.0, 0 0, 0.0 1.0, 30 -1) + CLIPS("min-clip", 20 18, 20 18, "max-clip", 1.0 0.0, 0 0, 0.0 1.0, 30 -1) + BUTTONS("button-close", "close-clip", 15 15, "close-clip", "bd_button_close_unfocused.png") + BUTTONS("button-max", "max-clip", 15 15, "max-clip", "bd_button_max_unfocused.png") + BUTTONS("button-min", "min-clip", 15 15, "min-clip", "bd_button_min_unfocused.png") + PART_EVENT_MAP("e.event.close", 1, "button-close") + PART_EVENT_MAP("e.event.maximize", 1, "button-max") + PART_EVENT_MAP("e.event.minimize", 1, "button-min") + RESIZE_TOP("resize_t", 1 2, 9999 2, "top-left", 0.0 0.0, 0 0, "top-right", 0.0 0.0, -1 0, 255 0 0 0) + part { name: "text_alt"; + type: TEXT; + effect: SOFT_SHADOW BOTTOM; + mouse_events: 0; + clip_to: "title2_rect"; + scale: 1; + description { + state: "default" 0.0; + color: 255 255 255 255; + color3: 255 255 255 255; + color_class: "border_title_active"; + rel1 { + to: "e.text.title"; + } + + rel2 { + to: "e.text.title"; + } + text { + text_source: "e.text.title"; + font: "Sans"; + size: 10; + min: 0 1; + align: 0.5 0.5; + text_class: "title_bar_alt"; + } + visible: 1; + } + + description { + state: "default" 0.1; + inherit: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + } + part { name: "title2_rect"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + rel1.to: "top-center-over"; + rel2.to: "top-center-over"; + } + } + E_SWALLOW_ICON("e.swallow.icon", "e.event.icon") + E_EVENT_ICON_LEFT("e.event.icon", "title.area.clip", "title.area.clip") + } + + programs { + BORDER_DEFAULT_PROGRAMS() + } +} + + group { name: "e/widgets/border/squared/border"; diff --git a/MokshaMoonlight/default.edc b/MokshaMoonlight/default.edc index 9a28a8e..2d2651a 100644 --- a/MokshaMoonlight/default.edc +++ b/MokshaMoonlight/default.edc @@ -218,6 +218,7 @@ image: "bd_button_max_unfocused.png" COMP; image: "bd_button_min_unfocused.png" COMP; image: "bd_top_over.png" COMP; +image: "bd_top_over_left.png" COMP; image: "bd_top_overm.png" COMP; image: "bd_top_right_over.png" COMP; image: "bd_top_left_over.png" COMP;