From e2b3f3e2ffa831be80f874cb91badf7345f80af4 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Thu, 30 May 2019 10:44:02 +0200 Subject: [PATCH] Center the position of the label if dir-name-position is 0.5 --- src/dirnode.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/dirnode.cpp b/src/dirnode.cpp index 2975e59a..87335f3f 100644 --- a/src/dirnode.cpp +++ b/src/dirnode.cpp @@ -901,22 +901,24 @@ void RDirNode::calcEdges() { void RDirNode::updateLabelOffset(float dt) { if (!parent) return; - const vec2 topLeft_align(-0.25f * label_size.y); - const vec2 bottomRight_align = label_size - topLeft_align; - - vec2 new_offset(topLeft_align); - if (parent->getProjectedPos().x > projected_pos.x) { - new_offset.x = bottomRight_align.x; - } - if (parent->getProjectedPos().y < projected_pos.y) { - new_offset.y = bottomRight_align.y; - } - - if (gGourceSettings.dir_name_position > 0.5f) { - const vec2 dirVec = glm::abs(parent->getProjectedPos() - projected_pos); - if (dirVec.x > dirVec.y) { - new_offset.x = (new_offset.x == topLeft_align.x ? bottomRight_align.x : topLeft_align.x); - new_offset.y = (new_offset.y == topLeft_align.y ? bottomRight_align.y : topLeft_align.y); + vec2 new_offset; + if (gGourceSettings.dir_name_position == 0.5f) { + //center the label + new_offset = label_size / vec2(2.0f); + } else { + const vec2 topLeft_align(-0.25f * label_size.y); + const vec2 bottomRight_align = label_size - topLeft_align; + + new_offset.x = (parent->getProjectedPos().x > projected_pos.x ? bottomRight_align.x : topLeft_align.x); + new_offset.y = (parent->getProjectedPos().y < projected_pos.y ? bottomRight_align.y : topLeft_align.y); + + //invert the alignment if dir_name_position > 0.5 and the angle is flat + if (gGourceSettings.dir_name_position > 0.5f) { + const vec2 dirVec = glm::abs(parent->getProjectedPos() - projected_pos); + if (dirVec.x > dirVec.y) { + new_offset.x = (new_offset.x == topLeft_align.x ? bottomRight_align.x : topLeft_align.x); + new_offset.y = (new_offset.y == topLeft_align.y ? bottomRight_align.y : topLeft_align.y); + } } }