summaryrefslogtreecommitdiff
diff options
authorBrandon Schaefer <brandon.schaefer@canonical.com>2013-03-19 10:52:08 -0700
committerBrandon Schaefer <brandon.schaefer@canonical.com>2013-03-19 10:52:08 -0700
commitdc24cb119220c5fbd63bc05446b440ea5c0df176 (patch)
treecf68192361424daae3dd4b228622615014cbf447
parent9190d22484d6208f4d83c1a920b0e07892ec7bbc (diff)
* Remove Relayout as its no longer needed
(bzr r3215.3.2)
-rw-r--r--hud/HudAbstractView.h1
-rw-r--r--hud/HudController.cpp2
-rw-r--r--hud/HudView.cpp9
-rw-r--r--hud/HudView.h1
4 files changed, 3 insertions, 10 deletions
diff --git a/hud/HudAbstractView.h b/hud/HudAbstractView.h
index 56f20e2be..a1c9ca0ba 100644
--- a/hud/HudAbstractView.h
+++ b/hud/HudAbstractView.h
@@ -43,7 +43,6 @@ public:
virtual void AboutToShow() = 0;
virtual void AboutToHide() = 0;
- virtual void Relayout() = 0;
virtual void ResetToDefault() = 0;
virtual void SearchFinished() = 0;
virtual void SetIcon(std::string const& icon_name, unsigned int tile_size, unsigned int size, unsigned int padding) = 0;
diff --git a/hud/HudController.cpp b/hud/HudController.cpp
index f8687a367..2c57aea12 100644
--- a/hud/HudController.cpp
+++ b/hud/HudController.cpp
@@ -252,7 +252,7 @@ void Controller::Relayout(bool check_monitor)
}
nux::Geometry const& geo = GetIdealWindowGeometry();
- view_->Relayout();
+ view_->QueueDraw();
window_->SetGeometry(geo);
panel::Style &panel_style = panel::Style::Instance();
view_->SetMonitorOffset(launcher_width, panel_style.panel_height);
diff --git a/hud/HudView.cpp b/hud/HudView.cpp
index 88fa0b942..ebea81ae4 100644
--- a/hud/HudView.cpp
+++ b/hud/HudView.cpp
@@ -116,7 +116,7 @@ View::View()
mouse_down.connect(sigc::mem_fun(this, &View::OnMouseButtonDown));
- Relayout();
+ QueueDraw();
}
View::~View()
@@ -193,11 +193,6 @@ void View::ResetToDefault()
search_bar_->search_hint = _("Type your command");
}
-void View::Relayout()
-{
- QueueDraw();
-}
-
nux::View* View::default_focus() const
{
return search_bar_->text_entry();
@@ -318,7 +313,7 @@ void View::ShowEmbeddedIcon(bool show)
}
UpdateLayoutGeometry();
- Relayout();
+ QueueDraw();
}
// Gives us the width and height of the contents that will give us the best "fit",
diff --git a/hud/HudView.h b/hud/HudView.h
index 486e8dad5..9cb88ce61 100644
--- a/hud/HudView.h
+++ b/hud/HudView.h
@@ -49,7 +49,6 @@ public:
void ResetToDefault();
- void Relayout();
nux::View* default_focus() const;
std::list<HudButton::Ptr> const& buttons() const;