summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-21 00:27:32 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-21 00:27:32 +0000
commit43e20b978e424d01ecbe49950b41111081a3ee43 (patch)
tree111336f68e90585acc6eb8b10fa0ad7dd4af5cb1 /src/gui
parent37b865d2ea580ee9abaf80b7c1efee1b062394c0 (diff)
downloadMana-43e20b978e424d01ecbe49950b41111081a3ee43.tar.gz
Mana-43e20b978e424d01ecbe49950b41111081a3ee43.tar.bz2
Mana-43e20b978e424d01ecbe49950b41111081a3ee43.tar.xz
Mana-43e20b978e424d01ecbe49950b41111081a3ee43.zip
A few small fixes.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/char_select.cpp7
-rw-r--r--src/gui/char_server.cpp1
-rw-r--r--src/gui/scrollarea.cpp2
3 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index e9e8609b..ad71cb31 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -433,6 +433,13 @@ void charSelect()
case SDL_QUIT:
state = EXIT;
break;
+
+ case SDL_KEYDOWN:
+ if (event.key.keysym.sym == SDLK_ESCAPE)
+ {
+ state = EXIT;
+ }
+ break;
}
guiInput->pushInput(event);
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index cb085053..a4a433a7 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -125,6 +125,7 @@ void char_server() {
switch (event.type) {
case SDL_QUIT:
state = EXIT;
+ showServerList = false;
break;
case SDL_KEYDOWN:
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 9bbdf797..d262d355 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -77,6 +77,8 @@ void ScrollArea::init()
void ScrollArea::draw(gcn::Graphics *graphics)
{
+ checkPolicies();
+
int alpha = getBaseColor().a;
gcn::Color highlightColor = getBaseColor() + 0x303030;
highlightColor.a = alpha;