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 Minimap window uses this so you can froce it to always be open. The
Minimap toggle button can be used to show or hide it temporarily, as
warping will reset it's visibility based on the sticky state and weather
the 'new' map has a minimap.
|
|
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
|
|
There is also a new rule that trivial constructors and destructors
should no longer be trivially "documented", since this just takes up
space with no gain.
|
|
Mostly unsigned/signed mismatches and an unused variable.
|
|
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)>
|
|
Conflicts:
Many files.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the palette colors. While technically, this can be accomplished through
other means, it's rather clumsy overall, and is prone to introducing in
programmer errors.
This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This is a header only-class that merges the textrendering of the
TextParticle and Text classes. It is done to reduce code duplication and
to prepare some color configuration gui.
|
|
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>
|
|
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>
|
|
other widget containers to use skins as well, and to make it easier to
extend later.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
skin loads.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
|
|
setLocationRelativeTo as well.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
that position. This makes it so that when resolutions are changed, the
default locations stay relative to the window's position, and not the
800x600 screen resolution.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
as removed a redundant call for sizing in the minimap class.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the maximum width and height. Exceeding the minumum width and height
is a desireable case in some situations.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This was needed in the Minimap class, but not migrated out to the Window
class until now.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
smaller than the minimum width and height (a check that should have
been enforced in the first place), as well as modified the NPC list and
text dialogs to remember where they were when they were moved or resized
last.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
of adding overridable close functionality to the Window class. Now, if
you need a close button, but need to do something different, or in
addition to the Window close functionality, you can override it and do
that action.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
code. While this shouldn't do too much, if anything, for performance, it
makes maintenence easier in the future if only one set of ints needs to
be modified rather than 9 when they do the same thing.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Conflicts:
src/being.cpp
src/being.h
src/floor_item.cpp
src/floor_item.h
src/flooritemmanager.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/itemcontainer.cpp
src/gui/popupmenu.cpp
src/net/beinghandler.cpp
src/npc.cpp
|
|
as some other optimizations that I could see that cut down on some
unneeded redraws, which in turn improved frame rates slightly.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
When not passing any parameters to constructors, there is no reason for
using parenthesis.
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Conflicts:
A lot of files...
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Conflicts:
Almost everywhere.
|
|
commit. Also, while the overall performance improved a little, it
doesn't appear to be as drastic as the last commit was suggesting.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
spots that could also be fixed up as well, but require other methods to
fix them (the filled color rectangles on the progress bars, as well as
the text on them as well, as an example).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This dates back to the old days of TMW, but the usage instructions of
GPLv2 don't mention this being necessary. Since it doesn't add anything,
avoid the branding in these sections.
|