From 44a1ffd370d5b3c7f987e54beecca63a7b9d8297 Mon Sep 17 00:00:00 2001 From: Ricardo Markiewicz Date: Sun, 30 Oct 2005 05:25:55 +0000 Subject: [PATCH] Pongo un cuadrado gris con el espacio libre al final. --- viewer/view_node.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/viewer/view_node.cpp b/viewer/view_node.cpp index dbcc818..c29d43f 100644 --- a/viewer/view_node.cpp +++ b/viewer/view_node.cpp @@ -10,9 +10,10 @@ ViewNode::ViewNode (Canvas::Group *parent, uint num, uint padre, BTreeNodeHeader this->padre = padre; /* Fondo */ - fondo = new Canvas::Rect (*this, 0, 0, ViewBTree::node_width, ViewBTree::node_height); - fondo->property_fill_color() = "gray"; - fondo->property_outline_color() = "black"; + int w1 = (int)(ViewBTree::node_width / 512.0f); + int used_width = 0; + + double y = 0; /* Header */ Canvas::Rect *h = new Canvas::Rect (*this, 0, 0, header_w, ViewBTree::node_height); @@ -27,16 +28,22 @@ ViewNode::ViewNode (Canvas::Group *parent, uint num, uint padre, BTreeNodeHeader new Canvas::Text (*this, header_w/2, ViewBTree::node_height/2, node_num); double x = header_w; + y = 0; std::list::iterator it = keys.begin (); while (it != keys.end ()) { BTreeData *data = (*it); double w = ViewBTree::byte_to_pixels * data->Size (); - ViewBTreeData *v = ViewBTreeData::Create (data, this, x, 0, w+x, ViewBTree::node_height); + ViewBTreeData *v = ViewBTreeData::Create (data, this, x, y, w+x, y+ViewBTree::node_height); v->signal_clicked ().connect ( sigc::mem_fun (this , &ViewNode::on_item_clicked )); v->signal_double_clicked ().connect ( sigc::mem_fun (this , &ViewNode::on_item_activated )); x += w; + used_width += w; + if (x >= 512) { + x = 0; + y += ViewBTree::node_height + 5; + } it++; datas.push_back (v); @@ -46,6 +53,12 @@ ViewNode::ViewNode (Canvas::Group *parent, uint num, uint padre, BTreeNodeHeader hijos.push_back (data->GetChild ()); } } + w1 = ViewBTree::node_width - used_width; + if (w1 > 0) { + fondo = new Canvas::Rect (*this, x, y, x+w1, ViewBTree::node_height+y); + fondo->property_fill_color() = "gray"; + fondo->property_outline_color() = "black"; + } } void ViewNode::on_item_clicked (BTreeData *data, ViewBTreeData *s) -- 2.43.0