From c35addb82dc268a1b7c3db3f3621f5629d21d788 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Fri, 12 Oct 2018 21:18:36 +0200 Subject: [PATCH] Improved the position of the directory labels. * Vertical and horizontal alignment always need to match to avoid overlapping of the label and the line. * Inverting the alignment on dir_name_position > 0.5 is only meaningful on a flat angle (below 45 degree in relation to the x axis) to avoid moving names on top of each other. --- src/dirnode.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/dirnode.cpp b/src/dirnode.cpp index 150165cc..8e3c6ae5 100644 --- a/src/dirnode.cpp +++ b/src/dirnode.cpp @@ -899,19 +899,22 @@ void RDirNode::calcEdges() { } void RDirNode::updateLabelOffset(float dt) { - if(!parent) return; + if (!parent) return; vec2 new_offset(0.0f); - - if (parent->getProjectedPos().y > projected_pos.y) { - // alignBottom + if (parent->getProjectedPos().x > projected_pos.x) { + new_offset.x = label_size.x; + } + if (parent->getProjectedPos().y < projected_pos.y) { new_offset.y = label_size.y; } - if ( (gGourceSettings.dir_name_position <= 0.5f && parent->getProjectedPos().x < projected_pos.x) - || (gGourceSettings.dir_name_position > 0.5f && parent->getProjectedPos().x > projected_pos.x)) { - // alignRight - new_offset.x = label_size.x; + 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 == 0.0 ? label_size.x : 0.0); + new_offset.y = (new_offset.y == 0.0 ? label_size.y : 0.0); + } } if (label_offset != new_offset) {