From b123eb709355b94a7c25ec1ec12ff7a428f7c186 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 5 Nov 2013 18:18:50 +0000 Subject: Remove 'action' mouse pointer. --- src/client/galaxymapwidget.cc | 8 ++++---- src/client/mapwidget.cc | 8 ++++---- src/ui/button.cc | 6 +++--- src/ui/iconbutton.cc | 6 +++--- src/ui/listitem.cc | 7 +++---- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/client/galaxymapwidget.cc b/src/client/galaxymapwidget.cc index 2a95c61..a49e004 100644 --- a/src/client/galaxymapwidget.cc +++ b/src/client/galaxymapwidget.cc @@ -159,10 +159,10 @@ void GalaxyMapWidget::draw() gl::end(); gl::disable(GL_TEXTURE_2D); - if (has_mouse_focus()) { - if (galaxymapwidget_hover_id) - ui::root()->set_pointer("action", ui::Palette::Highlight); - } +// if (has_mouse_focus()) { +// if (galaxymapwidget_hover_id) +// ui::root()->set_pointer("action", ui::Palette::Highlight); +// } } } // namespace client diff --git a/src/client/mapwidget.cc b/src/client/mapwidget.cc index c7d986b..3c0b95a 100644 --- a/src/client/mapwidget.cc +++ b/src/client/mapwidget.cc @@ -224,10 +224,10 @@ void MapWidget::draw() gl::disable(GL_TEXTURE_2D); - if (has_mouse_focus()) { - if (mapwidget_hover_id) - ui::root()->set_pointer("action", ui::Palette::Highlight); - } +// if (has_mouse_focus()) { +// if (mapwidget_hover_id) +// ui::root()->set_pointer("action", ui::Palette::Highlight); +// } } } // namespace client diff --git a/src/ui/button.cc b/src/ui/button.cc index e9a40b9..6c34a4f 100644 --- a/src/ui/button.cc +++ b/src/ui/button.cc @@ -88,9 +88,9 @@ void Button::draw() Paint::draw_label(global_location(), size(), font(), text(), alignment()); - if (enabled() && has_mouse_focus()) { - root()->set_pointer("action", Palette::Highlight); - } +// if (enabled() && has_mouse_focus()) { +// root()->set_pointer("action", Palette::Highlight); +// } } bool Button::on_keypress(const int key, const unsigned int modifier) diff --git a/src/ui/iconbutton.cc b/src/ui/iconbutton.cc index 066f5fa..b8dda87 100644 --- a/src/ui/iconbutton.cc +++ b/src/ui/iconbutton.cc @@ -85,9 +85,9 @@ void IconButton::draw() Paint::draw_bitmap(global_location(), size(), color, icon()); - if (enabled() && has_mouse_focus()) { - root()->set_pointer("action", Palette::Highlight); - } +// if (enabled() && has_mouse_focus()) { +// root()->set_pointer("action", Palette::Highlight); +// } } diff --git a/src/ui/listitem.cc b/src/ui/listitem.cc index 634cbaf..d7c3f1e 100644 --- a/src/ui/listitem.cc +++ b/src/ui/listitem.cc @@ -58,10 +58,9 @@ void ListItem::draw() Paint::draw_label(global_location(), size(), font(), text(), alignment()); - if (enabled() && has_mouse_focus()) { - root()->set_pointer("action", Palette::Highlight); - } - +// if (enabled() && has_mouse_focus()) { +// root()->set_pointer("action", Palette::Highlight); +// } } void ListItem::on_mouseover(const math::Vector2f &cursor) -- cgit v1.2.3