From c7de7922b963fe09b9c7eba700c113749ba6416a Mon Sep 17 00:00:00 2001 From: "Martin@MBP" Date: Thu, 7 May 2015 08:24:48 +0200 Subject: [PATCH] Fix selected + unselectable shows unchecked checkbox Close #427 --- CHANGELOG.md | 1 + src/skin-awesome/ui.fancytree.css | 3 +-- src/skin-bootstrap-n/ui.fancytree.css | 3 +-- src/skin-bootstrap/ui.fancytree.css | 3 +-- src/skin-common.less | 11 +++++++++-- src/skin-lion/ui.fancytree.css | 11 +++++++++-- src/skin-vista/ui.fancytree.css | 11 +++++++++-- src/skin-win7/ui.fancytree.css | 11 +++++++++-- src/skin-win8-n/ui.fancytree.css | 11 +++++++++-- src/skin-win8-xxl/ui.fancytree.css | 11 +++++++++-- src/skin-win8/ui.fancytree.css | 11 +++++++++-- src/skin-xp/ui.fancytree.css | 11 +++++++++-- 12 files changed, 76 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 026b7938..ab5c6f96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # 2.9.1-0 / Unreleased + * [Fixed] #427 selected and unselectable shows unchecked checkbox # 2.9.0 / 2015-04-19 * [Changed] ext-filter: `tree.filterNodes(filter, opts)` now accept an `opts` diff --git a/src/skin-awesome/ui.fancytree.css b/src/skin-awesome/ui.fancytree.css index 19f92896..645e1069 100644 --- a/src/skin-awesome/ui.fancytree.css +++ b/src/skin-awesome/ui.fancytree.css @@ -122,8 +122,7 @@ span.fancytree-expander { span.fancytree-checkbox { margin-left: 0.5em; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); } diff --git a/src/skin-bootstrap-n/ui.fancytree.css b/src/skin-bootstrap-n/ui.fancytree.css index 240cb4f5..40e767e6 100644 --- a/src/skin-bootstrap-n/ui.fancytree.css +++ b/src/skin-bootstrap-n/ui.fancytree.css @@ -122,8 +122,7 @@ span.fancytree-expander { span.fancytree-checkbox { margin-left: 0.5em; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); } diff --git a/src/skin-bootstrap/ui.fancytree.css b/src/skin-bootstrap/ui.fancytree.css index efe79dbc..83074707 100644 --- a/src/skin-bootstrap/ui.fancytree.css +++ b/src/skin-bootstrap/ui.fancytree.css @@ -122,8 +122,7 @@ span.fancytree-expander { span.fancytree-checkbox { margin-left: 0.5em; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); } diff --git a/src/skin-common.less b/src/skin-common.less index 735bd46d..cbd67cbd 100644 --- a/src/skin-common.less +++ b/src/skin-common.less @@ -277,12 +277,19 @@ span.fancytree-checkbox { } // Unselectable is dimmed, without hover effects .fancytree-unselectable { - span.fancytree-checkbox, - span.fancytree-checkbox:hover { + span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); + } + span.fancytree-checkbox:hover { .useSprite(0, 2); } + &.fancytree-partsel span.fancytree-checkbox:hover { + .useSprite(4, 2); + } + &.fancytree-selected span.fancytree-checkbox:hover { + .useSprite(2, 2); + } } /*------------------------------------------------------------------------------ diff --git a/src/skin-lion/ui.fancytree.css b/src/skin-lion/ui.fancytree.css index 98e61590..45c6c0e1 100644 --- a/src/skin-lion/ui.fancytree.css +++ b/src/skin-lion/ui.fancytree.css @@ -193,12 +193,19 @@ span.fancytree-checkbox:hover { .fancytree-selected span.fancytree-checkbox:hover { background-position: -48px -32px; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); +} +.fancytree-unselectable span.fancytree-checkbox:hover { background-position: 0px -32px; } +.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover { + background-position: -64px -32px; +} +.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover { + background-position: -32px -32px; +} /*------------------------------------------------------------------------------ * Radiobutton icon * This is a customization, that may be activated by overriding the 'checkbox' diff --git a/src/skin-vista/ui.fancytree.css b/src/skin-vista/ui.fancytree.css index db6ef8a8..a0b0584d 100644 --- a/src/skin-vista/ui.fancytree.css +++ b/src/skin-vista/ui.fancytree.css @@ -203,12 +203,19 @@ span.fancytree-checkbox:hover { .fancytree-selected span.fancytree-checkbox:hover { background-position: -48px -32px; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); +} +.fancytree-unselectable span.fancytree-checkbox:hover { background-position: 0px -32px; } +.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover { + background-position: -64px -32px; +} +.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover { + background-position: -32px -32px; +} /*------------------------------------------------------------------------------ * Radiobutton icon * This is a customization, that may be activated by overriding the 'checkbox' diff --git a/src/skin-win7/ui.fancytree.css b/src/skin-win7/ui.fancytree.css index 71bde0e5..f5f94482 100644 --- a/src/skin-win7/ui.fancytree.css +++ b/src/skin-win7/ui.fancytree.css @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover { .fancytree-selected span.fancytree-checkbox:hover { background-position: -48px -32px; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); +} +.fancytree-unselectable span.fancytree-checkbox:hover { background-position: 0px -32px; } +.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover { + background-position: -64px -32px; +} +.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover { + background-position: -32px -32px; +} /*------------------------------------------------------------------------------ * Radiobutton icon * This is a customization, that may be activated by overriding the 'checkbox' diff --git a/src/skin-win8-n/ui.fancytree.css b/src/skin-win8-n/ui.fancytree.css index 4301af76..d5c7139b 100644 --- a/src/skin-win8-n/ui.fancytree.css +++ b/src/skin-win8-n/ui.fancytree.css @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover { .fancytree-selected span.fancytree-checkbox:hover { background-position: -48px -32px; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); +} +.fancytree-unselectable span.fancytree-checkbox:hover { background-position: 0px -32px; } +.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover { + background-position: -64px -32px; +} +.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover { + background-position: -32px -32px; +} /*------------------------------------------------------------------------------ * Radiobutton icon * This is a customization, that may be activated by overriding the 'checkbox' diff --git a/src/skin-win8-xxl/ui.fancytree.css b/src/skin-win8-xxl/ui.fancytree.css index 49f0474a..df8c7956 100644 --- a/src/skin-win8-xxl/ui.fancytree.css +++ b/src/skin-win8-xxl/ui.fancytree.css @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover { .fancytree-selected span.fancytree-checkbox:hover { background-position: -96px -64px; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); +} +.fancytree-unselectable span.fancytree-checkbox:hover { background-position: 0px -64px; } +.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover { + background-position: -128px -64px; +} +.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover { + background-position: -64px -64px; +} /*------------------------------------------------------------------------------ * Radiobutton icon * This is a customization, that may be activated by overriding the 'checkbox' diff --git a/src/skin-win8/ui.fancytree.css b/src/skin-win8/ui.fancytree.css index 8e68daa6..0054de14 100644 --- a/src/skin-win8/ui.fancytree.css +++ b/src/skin-win8/ui.fancytree.css @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover { .fancytree-selected span.fancytree-checkbox:hover { background-position: -48px -32px; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); +} +.fancytree-unselectable span.fancytree-checkbox:hover { background-position: 0px -32px; } +.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover { + background-position: -64px -32px; +} +.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover { + background-position: -32px -32px; +} /*------------------------------------------------------------------------------ * Radiobutton icon * This is a customization, that may be activated by overriding the 'checkbox' diff --git a/src/skin-xp/ui.fancytree.css b/src/skin-xp/ui.fancytree.css index ceec0045..a29aa072 100644 --- a/src/skin-xp/ui.fancytree.css +++ b/src/skin-xp/ui.fancytree.css @@ -186,12 +186,19 @@ span.fancytree-checkbox:hover { .fancytree-selected span.fancytree-checkbox:hover { background-position: -48px -32px; } -.fancytree-unselectable span.fancytree-checkbox, -.fancytree-unselectable span.fancytree-checkbox:hover { +.fancytree-unselectable span.fancytree-checkbox { opacity: 0.4; filter: alpha(opacity=40); +} +.fancytree-unselectable span.fancytree-checkbox:hover { background-position: 0px -32px; } +.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover { + background-position: -64px -32px; +} +.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover { + background-position: -32px -32px; +} /*------------------------------------------------------------------------------ * Radiobutton icon * This is a customization, that may be activated by overriding the 'checkbox'