From eca1d8af3589e8aa8f0f04a4aa6ec9ffd51f9037 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 11 Jan 2013 11:21:20 +0000 Subject: [PATCH] add focus-out color class and functionality to default theme SVN revision: 82628 --- ChangeLog | 1 + NEWS | 1 + data/themes/edc/comp.edc | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c44eaaf75..16b031dde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * e_manager_comp_set() is no longer accessible by modules * added option to disable comp effects on screen * fixed bug where backlight settings would try to update dummy backlight devices + * added focus-out color class and functionality to default theme 2013-01-10 Carsten Haitzler diff --git a/NEWS b/NEWS index fa9a35801..ad024a222 100644 --- a/NEWS +++ b/NEWS @@ -63,6 +63,7 @@ Improvements: * E_LIST_HANDLER_APPEND macro now asserts the event handler to make debugging easier * config submenu now sets "config" category * composite settings dialog is now accessible from Settings menu + * added focus-out color class and functionality to default theme Fixes: * Force check changed upon confirmation dialog closure for engine settings. diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc index d9ceef767..aa3457629 100644 --- a/data/themes/edc/comp.edc +++ b/data/themes/edc/comp.edc @@ -224,6 +224,13 @@ group { name: "e/comp/default"; alias: "e/comp/popup"; images.image: "win_shadow.png" COMP; images.image: "win_glow.png" COMP; + color_classes { + color_class { + name: "comp_focus-out_color"; + color: 253 253 253 255; + color3: 0 0 0 0; + } + } parts { part { name: "clipper"; type: RECT; description { state: "default" 0.0; @@ -288,8 +295,23 @@ group { name: "e/comp/default"; rel2.relative: 1.0 1.0; } } - part { name: "e.swallow.content"; type: SWALLOW; + part { name: "focus-clipper"; + type: RECT; clip_to: "clipper"; + mouse_events: 0; + description { state: "default" 0.0; + color_class: "comp_focus-out_color"; + rel1.to: "clipper"; + rel2.to: "clipper"; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color_class: ""; + color: 255 255 255 255; + } + } + part { name: "e.swallow.content"; type: SWALLOW; + clip_to: "focus-clipper"; description { state: "default" 0.0; rel1.to: "shower"; rel2.to: "shower"; @@ -334,6 +356,7 @@ group { name: "e/comp/default"; action: STATE_SET "focused" 0.0; transition: SINUSOIDAL 0.1; target: "glow"; + target: "focus-clipper"; after: "focus2"; } program { name: "focus2"; @@ -341,9 +364,12 @@ group { name: "e/comp/default"; transition: SINUSOIDAL 0.4; target: "glow"; } -// program { -// signal: "e,state,focus,off"; source: "e"; -// } + program { + signal: "e,state,focus,off"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.1; + target: "focus-clipper"; + } program { name: "urgent1"; signal: "e,state,urgent,on"; source: "e"; action: STATE_SET "focused" 0.0;