From bdaf082fc2f55fb3a410d60403edf113c5fb4946 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 25 Mar 2013 20:59:59 +0000 Subject: [PATCH] (svn r25123) -Fix: when the count for a scrollbar was 0, the inter distance was subtracted too much causing a scrollbar with a negative size --- src/widget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/widget.cpp b/src/widget.cpp index cebff2e89d..72612a48ef 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1470,7 +1470,8 @@ void NWidgetMatrix::SetCount(int count) * and post spacing "offsets". */ count = CeilDiv(count, this->sb->IsVertical() ? this->widgets_x : this->widgets_y); count *= (this->sb->IsVertical() ? this->head->smallest_y : this->head->smallest_x) + this->pip_inter; - count += -this->pip_inter + this->pip_pre + this->pip_post; // We counted an inter too much in the multiplication above + if (count > 0) count -= this->pip_inter; // We counted an inter too much in the multiplication above + count += this->pip_pre + this->pip_post; this->sb->SetCount(count); this->sb->SetCapacity(this->sb->IsVertical() ? this->current_y : this->current_x); this->sb->SetStepSize(this->sb->IsVertical() ? this->widget_h : this->widget_w);