From 7407ca35da76e41d2b18d5b2e82de65e2e102c96 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Mon, 14 Nov 2011 13:01:09 -0200
Subject: [PATCH] fix tooltip regression, change readme

---
 README                      | 16 ----------------
 README.rdoc                 | 18 ++++++++++++++++++
 TODO                        |  6 +++---
 modules/tooltip/tooltip.lua |  9 +++++----
 4 files changed, 26 insertions(+), 23 deletions(-)
 delete mode 100644 README
 create mode 100644 README.rdoc

diff --git a/README b/README
deleted file mode 100644
index b5bc6b3e..00000000
--- a/README
+++ /dev/null
@@ -1,16 +0,0 @@
-ABOUT
-    OTClient is an alternative tibia client. Currently in early stage
-    and it aims to be a complete flexible client to otserv. It uses LUA
-    scripting for all UI functionality and allow custom user MODs via scripts.
-    Inspirited by "World of Warcraft" and "Heroes of Newerth" where
-    users can create custom game scripts and on top of the original game.
-
-COMPILING AND RUNNING
-
-    $ cmake .
-    $ make
-    $ ./otclient
-
-LICENSE
-
-    OTClient is made available under the MIT License
diff --git a/README.rdoc b/README.rdoc
new file mode 100644
index 00000000..a3ef2932
--- /dev/null
+++ b/README.rdoc
@@ -0,0 +1,18 @@
+=== Welcome
+OTClient is an alternative tibia client for otserv written in C++2011, made
+with a modular system that uses lua scripts for ingame interface and
+functionality, making otclient flexible and easy to customize.
+
+=== Getting Started
+
+* {Compiling on Windows}[http://otclient.info/page/articles.html/_/general/compiling-on-windows-r9]
+* {Compiling on Ubuntu}[http://otclient.info/page/articles.html/_/general/compiling-on-ubuntu-r12]
+Checkout our website at {http://otclient.info}[http://otclient.info/] for tutorials and more information
+
+=== Contributing
+
+We encourage you to contribute to OTClient! Please check out
+{our website}[http://otclient.info/] for guidelines about how to proceed. Join us!
+
+=== License
+OTClient is made available under the MIT License
diff --git a/TODO b/TODO
index b4e89713..0de6d376 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,14 @@
 modules managment interface
 clean sprites cache periodically
-hotkeys events in lua
 load modules from zip packages
 ip/host/rsa configuration
 review directories search
-tooltips
 left panel with dragging windows
 console history
 console text selection
 console scrolling
 padding
 remember password/account
-move fps to a module
\ No newline at end of file
+scrollbar
+make otui syntax more like css
+a real working border and background property in otui
\ No newline at end of file
diff --git a/modules/tooltip/tooltip.lua b/modules/tooltip/tooltip.lua
index 4f654e61..2ba13d59 100644
--- a/modules/tooltip/tooltip.lua
+++ b/modules/tooltip/tooltip.lua
@@ -40,7 +40,7 @@ function ToolTip.hide()
   end
 end
 
--- hooks
+-- UIWidget hooks
 local function onWidgetHoverChange(widget, hovered)
   if hovered then
     ToolTip.display(widget.tooltip)
@@ -50,14 +50,15 @@ local function onWidgetHoverChange(widget, hovered)
 end
 
 local function onWidgetStyleApply(widget, style)
-  if not style then return end
-  widget.tooltip = style.tooltip
+  if style and style.tooltip then
+    widget.tooltip = style.tooltip
+  end
 end
 
 connect(UIWidget, {  onStyleApply = onWidgetStyleApply,
                      onHoverChange = onWidgetHoverChange})
 
--- public extensions
+-- UIWidget extensions
 function UIWidget:setTooltip(text)
   self.tooltip = text
 end