diff --git a/src/assets/main.scss b/src/assets/main.scss index 4ce809d..8c6be5b 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -650,6 +650,12 @@ body{ } } } + .entite-map-popup{ + span.point{ + font-weight: 900; + color: #01ffe2; + } + } h1, div{ font-size: 1em; font-weight: 400; diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue index 0cfc510..d119a2c 100644 --- a/src/components/ConcernementMapItem.vue +++ b/src/components/ConcernementMapItem.vue @@ -186,6 +186,12 @@ export default { }, deep: true }, + is_hover: { + handler (n, o) { + this.onIsHover(n); + }, + deep: true + }, active_revision: { handler (n, o) { console.log(`concernementMapItem watch active_revision o:${o}, n:${n}`); @@ -1250,6 +1256,26 @@ export default { } }, + onIsHover(){ + // handle layer z-index + if (this.is_hover) { + this.paper_main_object.bringToFront(); + } else { + this.paper_main_object.sendToBack(); + } + // hightlight superposed entites on focus + let entites_superposes = this.paper_main_object.children['entites_superposes']; + // console.log('entites_superposes.children', entites_superposes.children); + for(let paper_item of entites_superposes.children) { + if (this.is_hover) { + paper_item.definition = this.paper_symbol_definitions.entite_hover; + paper_item.scale(2) + } else { + paper_item.definition = this.paper_symbol_definitions.entite; + paper_item.scale(0.5) + } + } + }, // PAPER EVENTS initPaperEvents(){ @@ -1938,11 +1964,10 @@ export default { if (this.is_hover) { // if mouse hover reset the matter body position to prev position Matter.Body.setPosition(this.body, {x:this.pos.x, y:this.pos.y}, true); + }else{ // else move following the matter body position + this.paper_main_object.position = this.pos = this.body.position; } - this.paper_main_object.position = this.pos = this.body.position; - - this.handlePaperVisibilityOnAfterEnginUpdate() }, diff --git a/src/components/ConcernementMapPopup.vue b/src/components/ConcernementMapPopup.vue index e9034ad..fa5b275 100644 --- a/src/components/ConcernementMapPopup.vue +++ b/src/components/ConcernementMapPopup.vue @@ -149,10 +149,13 @@ export default {
-

⋅ {{ entite.entite.title }}

+ > +

{{ entite.entite.title }}

+ +
@@ -169,4 +172,5 @@ export default { diff --git a/src/components/MapConcernements.vue b/src/components/MapConcernements.vue index 0a03fc8..e16087c 100644 --- a/src/components/MapConcernements.vue +++ b/src/components/MapConcernements.vue @@ -1048,7 +1048,7 @@ export default { }) }, async setSuperpositionsMatterConstraints(){ - await nextTick(); + await nextTick(); // wait for dom to be upadted before applying consraint console.log('setSuperpositionsMatterConstraints this.allSuperpositions', this.allSuperpositions); // let allBodies = Matter.Composite.allBodies(this.world); // console.log('allBodies', allBodies);