From ef6dc3c2baa6be8071bbf5f4e7063de9707d5ac2 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Sun, 29 Aug 2021 12:00:50 +0100
Subject: [PATCH] elm theme - more cc

---
 data/elementary/themes/colorclasses.edc       |  3 ++
 .../themes/edc/elm/fileselector.edc           | 37 +++++++------------
 src/bin/elementary/test_fileselector_button.c |  1 +
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 8c5aa0257f..49fafd98b1 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -364,6 +364,9 @@ color_classes {
       color: 160 160 160 255; }
    color_class { name: "/fg/disabled/flipselector/up";
       color:  96  96  96 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/fg/nmormal/fileselector/pathsep";
+      color:  51 153 255 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/normal/button";
       color:  96  96  96 255; }
diff --git a/data/elementary/themes/edc/elm/fileselector.edc b/data/elementary/themes/edc/elm/fileselector.edc
index ae9ee2fa3f..f289507247 100644
--- a/data/elementary/themes/edc/elm/fileselector.edc
+++ b/data/elementary/themes/edc/elm/fileselector.edc
@@ -1,11 +1,12 @@
 group { name: "elm/entry/path/separator/default";
    parts {
       image { "icon"; nomouse;
+         scale: 1;
          desc { "default";
             image.normal: "i-arrow-r";
             FIXED_SIZE(15, 15)
             aspect: 1.0 1.0;
-            color: 51 153 255 255;
+            color_class: "/fg/nmormal/fileselector/pathsep";
          }
       }
    }
@@ -62,14 +63,12 @@ group { name: "elm/fileselector/base/default";
             offscale;
          }
       }
-#ifdef ELM_CANCEL_OK
-      swallow { "elm.swallow.ok";
-#else
       swallow { "elm.swallow.cancel";
-#endif
+         scale;
          desc { "default";
             align: 1.0 1.0;
             fixed: 1 1;
+            min: 80 4;
             rel1.relative: 1.0 1.0;
             rel1.offset: -5 -5;
             rel2.relative: 1.0 1.0;
@@ -77,29 +76,19 @@ group { name: "elm/fileselector/base/default";
             offscale;
          }
       }
-#ifdef ELM_CANCEL_OK
-      swallow { "elm.swallow.cancel";
-#else
       swallow { "elm.swallow.ok";
-#endif
+         scale;
          desc { "default";
             align: 1.0 0.5;
             fixed: 1 0;
+            min: 80 4;
             rel1 {
-#ifdef ELM_CANCEL_OK
-               to: "elm.swallow.ok";
-#else
                to: "elm.swallow.cancel";
-#endif
                relative: 0.0 0.0;
                offset: -5 0;
             }
             rel2 {
-#ifdef ELM_CANCEL_OK
-               to: "elm.swallow.ok";
-#else
                to: "elm.swallow.cancel";
-#endif
                relative: 0.0 1.0;
                offset: -5 -1;
             }
@@ -111,7 +100,7 @@ group { name: "elm/fileselector/base/default";
          desc { "default";
             align: 1.0 1.0;
             fixed: 1 1;
-            min: 21 21;
+            min: 80 4;
             rel1 {
                to_y: "elm.swallow.ok";
                relative: 1.0 0.0;
@@ -130,7 +119,7 @@ group { name: "elm/fileselector/base/default";
          desc { "default";
             align: 0.5 1.0;
             fixed: 0 1;
-            min: 40 21;
+            min: 160 20;
             rel1 {
                to_y: "elm.swallow.filters";
                relative: 0.0 0.0;
@@ -149,7 +138,7 @@ group { name: "elm/fileselector/base/default";
          desc { "default";
             align: 0.5 1.0;
             fixed: 0 1;
-            min: 40 21;
+            min: 160 20;
             rel1 {
                to_y: "elm.swallow.filename";
                relative: 0.0 0.0;
@@ -166,7 +155,7 @@ group { name: "elm/fileselector/base/default";
       swallow { "elm.swallow.files";
          scale: 1;
          desc { "default";
-            min: 21 21;
+            min: 160 80;
             rel1 {
                to_y: "elm.swallow.home";
                relative: 0.0 1.0;
@@ -197,11 +186,11 @@ group { name: "elm/fileselector/base/default";
          desc { "default";
             fixed: 1 1;
             rel.to: "elm.swallow.spinner";
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
          }
          desc { "visible";
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
    }
@@ -245,7 +234,7 @@ group { name: "elm/fileselector_entry/base/default";
          scale: 1;
          desc { "default";
             align: 0.0 0.5;
-            min: 50 4;
+            min: 80 4;
             rel2 { to_x: "elm.swallow.button";
                relative: 0.0 1.0;
                offset: -1 -1;
diff --git a/src/bin/elementary/test_fileselector_button.c b/src/bin/elementary/test_fileselector_button.c
index 2ee1a3338c..e3410bf92b 100644
--- a/src/bin/elementary/test_fileselector_button.c
+++ b/src/bin/elementary/test_fileselector_button.c
@@ -195,6 +195,7 @@ test_fileselector_button(void *data       EINA_UNUSED,
    elm_object_text_set(fs_bt, "Select a file");
    elm_object_part_content_set(fs_bt, "icon", ic);
    elm_fileselector_path_set(fs_bt, "/tmp/test_fs_bt");
+   evas_object_show(ic);
 
    elm_box_pack_end(vbox, fs_bt);
    evas_object_show(fs_bt);