Imported Upstream version 1.0.2upstream/1.0.2

1 files changed, 9 insertions, 3 deletions

diff --git a/Panel.c b/Panel.c
index b090c52..d0f69bf 100644
--- a/Panel.c
+++ b/Panel.c
@@ -199,8 +199,10 @@ Object* Panel_remove(Panel* this, int i) {
 
 Object* Panel_getSelected(Panel* this) {
    assert (this != NULL);
-
-   return Vector_get(this->items, this->selected);
+   if (Vector_size(this->items) > 0)
+      return Vector_get(this->items, this->selected);
+   else
+      return NULL;
 }
 
 void Panel_moveSelectedUp(Panel* this) {
@@ -248,7 +250,11 @@ void Panel_draw(Panel* this, bool focus) {
    int scrollH = this->scrollH;
    int y = this->y; int x = this->x;
    int first = this->scrollV;
-   int last = MIN(itemCount, this->scrollV + MIN(itemCount, this->h));
+   if (itemCount > this->h && first > itemCount - this->h) {
+      first = itemCount - this->h;
+      this->scrollV = first;
+   }
+   int last = MIN(itemCount, first + MIN(itemCount, this->h));
    if (this->selected < first) {
       first = this->selected;
       this->scrollV = first;