summaryrefslogtreecommitdiff
path: root/src/gui/window.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-26Compile warning fixesBjørn Lindeijer1-9/+4
Mostly unsigned/signed mismatches and an unused variable.
2009-03-26Some code cleanups (mostly reducing how many calculations need to beIra Rice1-9/+2
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>
2009-03-25Modified skin loading to save and load a skin's XML path, as well asIra Rice1-1/+11
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>
2009-03-25Moved the responsibility for skin alpha adjustment to the Skin class.Ira Rice1-41/+0
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)>
2009-03-18Fix up the NPC interraction widnows a bitJared Adams1-1/+1
2009-03-15Fix some mem leaksJared Adams1-0/+2
2009-03-14Exposed the progress bar colors to the color management tab.Ira Rice1-0/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Made a label class derived from the guichan label class which utilizesIra Rice1-1/+2
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>
2009-03-12Added a class for rendering of floating textsniper1-0/+1
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.
2009-03-11Enforce minimum widths and heights to be at least as big as the minumumIra Rice1-2/+3
width and height for the skin used. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-11Modified Skin class to use proper encapsulation, instead of leaving itsIra Rice1-9/+9
skin variables public. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-11Added a new Popup class, which overall is functionally similar to theIra Rice1-31/+30
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>
2009-03-11Moved the Skin class outside of the Window class, in order to allowIra Rice1-148/+8
other widget containers to use skins as well, and to make it easier to extend later. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Introduced in a Skin holder class, to reduce the amount of needed XMLIra Rice1-38/+59
skin loads. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Fix some mem leaksJared Adams1-2/+0
2009-03-10Fix some mem leaksJared Adams1-0/+2
2009-03-10Allow for offsets for the enumerated position version ofIra Rice1-16/+15
setLocationRelativeTo as well. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Extended window layout to take relative positions, as well as offsets toIra Rice1-0/+99
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>
2009-03-10Reverted last commit (since I confused it with something else) as wellIra Rice1-2/+6
as removed a redundant call for sizing in the minimap class. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Fixed setContentSize in the window class to only care about exceedingIra Rice1-6/+2
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>
2009-03-10Moved enforcement of minimum widths and heights to the Window class.Ira Rice1-9/+44
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>
2009-03-10Made it so that when windows load previous states, they are neverIra Rice1-16/+25
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>
2009-03-09Got rid of an ugly and unified interface breaking cancel button in favorIra Rice1-1/+6
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>
2009-03-06Cut down on redundant constant int declarations in the windows skinningIra Rice1-68/+6
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>
2009-03-05Made some optimizations based on some profiling done by Octalot, as wellIra Rice1-0/+3
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>
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-16/+16
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-04Few more unneeded headers that weren't noticed originally in the lastIra Rice1-2/+0
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>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-2/+0
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>
2009-01-30Exposed most gui elements to take alpha values. There are still a fewIra Rice1-0/+1
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>
2009-01-30Re-enabled real time gui opacity updating.Ira Rice1-3/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
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.
2009-01-18Fixed layout of video setup page when translatedBjørn Lindeijer1-5/+4
Introduced a LayoutHelper class which can be used for any non-Window container where you want to use a layout to place child widgets.
2009-01-15Fixed Item Popup window transparency (double setting of the skin)Ira Rice1-3/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Merged layout handler from mainlineBjørn Lindeijer1-34/+49
Also fixed login dialog layout. This is the layout handler by Guillaume Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice1-0/+1
class. NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to install it, regenerate your config files, reconfigure, and then install before attempting to compile. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer1-11/+8
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-0/+1
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-21Changed windowing code to allow for multiple skins. This will be Ira Rice1-10/+11
modified in a bit so that there are no redundant skin loads, but for now, it doesn't leak any more as well.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-5/+3
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-35/+211
2008-08-06Make sure only to save the window state when a window name is set, and failBjørn Lindeijer1-8/+11
when loadWindowState() is called without setting a window name.
2008-07-25Applied patch by ElvenProgrammer to remember window locations between sessionsLloyd Bryant1-0/+2
2008-07-23Remember windows visibility.Eugenio Favalli1-0/+2
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-04-29* Fixed issue with determining whether chat input is focused (method no longerBjørn Lindeijer1-4/+4
virtual). * Fixed sometimes rendering with the wrong font. * Fixed warnings about hiding virtual method, Window now always deletes its children (the option not to do so was never used anyway).
2008-04-07Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except forBjørn Lindeijer1-89/+16
gcn::TabbedArea usage)
2007-11-20Merged revisions 3692 via svnmerge from Bjørn Lindeijer1-1/+4
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3692 | gmelquio | 2007-10-27 11:03:13 +0200 (Sat, 27 Oct 2007) | 1 line Made it compile with GCC 4.3 ........
2007-11-20Merged revisions 3642,3662-3664,3667 via svnmerge from Bjørn Lindeijer1-7/+8
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3642 | gmelquio | 2007-10-19 19:46:46 +0200 (Fri, 19 Oct 2007) | 1 line Factored code between resource handlers. Implemented failure-friendly sprite loader. ........ r3662 | gmelquio | 2007-10-21 21:01:16 +0200 (Sun, 21 Oct 2007) | 1 line Added persistent positioning. ........ r3663 | gmelquio | 2007-10-21 21:03:43 +0200 (Sun, 21 Oct 2007) | 1 line Fixed missing pixels at bottom and right. ........ r3664 | gmelquio | 2007-10-21 21:05:56 +0200 (Sun, 21 Oct 2007) | 1 line Changed to use default values when restoring missing settings. ........ r3667 | gmelquio | 2007-10-21 22:09:08 +0200 (Sun, 21 Oct 2007) | 1 line Fixed invisible text in dropboxes and shopboxes. ........
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-04 02:12:40 +0000