| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
In an attempt to make the GUI code a little more structured, basic
widgets are now put in gui/widgets. Many includes were also cleaned up.
|
|
The draw() method of a widget isn't called when a widget is not visible.
|
|
Conflicts:
src/beingmanager.cpp
src/gui/confirm_dialog.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/label.cpp
src/gui/label.h
src/gui/popup.cpp
src/gui/popup.h
src/gui/scrollarea.cpp
src/gui/skin.cpp
src/gui/skin.h
src/gui/speechbubble.cpp
src/gui/window.cpp
src/gui/window.h
src/localplayer.h
src/main.cpp
src/net/ea/playerhandler.cpp
src/resources/ambientoverlay.h
src/resources/dye.cpp
src/resources/imagewriter.cpp
src/resources/itemdb.cpp
src/shopitem.cpp
|
|
wasn't really useful or used at all. Also removed some unneeded includes
in the popup class.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
this currently does not provide any useful functionality to popups, as
well as doing anything for that matter.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Mostly unsigned/signed mismatches and an unused variable.
|
|
done in certain statements, rearranging arguements to make them look
cleaner, or overall making the code slightly more flexible)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Mostly putting & and * in the right place and making some getters const.
|
|
|
|
modified the skin loading method to take a default value, in case the
value in the configuration file fails to load for one reason or another.
While this doesn't directly expose skinning on a per window basis to the
user at the moment, it does allow people to change what skins get loaded
with which windows now without needing to modify the code.
TODO: Determine a decent approach to allowing the user to change their
window skins in game, as well as moving all widget skin loading to the
skin class (for instance, the button skins, progressbar skins, etc.) so
that different skin configurations can use different widget skins.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This fixes a break that occured where skins wouldn't update in real time
in the client, due to being passed a reference, rather than getting the
skin itself.
Signed-off-by: Ira Rice <shogun@odin.(none)>
|
|
width and height for the skin used.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
skin variables public.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
least for popup type functionality, this isn't needed.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Window class, but stripped down to the bare essential functionality to
just draw and position them. This means no resizing, no close buttons,
no ability to move them, etc. This should help reduce the overhead in
drawing speech bubbles, as well as other popup type dialogs, but is also
not a drop in replacement for the Window class as well.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
