summaryrefslogtreecommitdiff
path: root/src/gui/itempopup.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-26Remove redundancy, fix variable names and other code cleanupsBjørn Lindeijer1-3/+1
2009-03-25A host of code style fixesBjørn Lindeijer1-1/+1
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-27/+39
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-25/+32
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-0/+2
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-03-19Some minor cleanups in a few windows and build scripts, as well asIra Rice1-2/+0
fixing tables to correct the highlights to draw where they're supposed to, as well as at the opacity they're supposed to. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Make sure positionable dialogs start out centeredJared Adams1-1/+1
2009-03-14Commented up item popups, speech bubbles, as well as only update itemIra Rice1-2/+15
info on item change. Also fixed color updating for item shortcuts and item links, as the displayed colors wouldn't update on change on color change in the setup color dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-13Added item types to the palette class.Ira Rice1-13/+14
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-11Added a new Popup class, which overall is functionally similar to theIra Rice1-9/+4
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-06Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+3
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
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-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-3/+3
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Add configurable units systemJared Adams1-2/+4
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-3/+3
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-10Whitespace fixesBjørn Lindeijer1-3/+3
Mainly removed trailing whitespace. Also small fix in header of recorder.cpp.
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-1/+1
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-5/+6
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-1/+1
2009-02-10Whitespace fixesBjørn Lindeijer1-3/+3
Mainly removed trailing whitespace. Also small fix in header of recorder.cpp.
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-3/+3
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-31/+71
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-8/+8
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-07Small tweak to item popup locations based on some feedback that theyIra Rice1-2/+2
were a tad too close to the mouse. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Added destructors to some classes originally obtained from Legends ofIra Rice1-0/+11
Mazzeroth. At the moment, I think this is the last of the missing pointer deletes, but if more are found, then I'll add them to the proper classes and delete them. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-6/+2
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-28Adjusted a few color defaults to make them easier to see.Ira Rice1-4/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Added coloring of item names by type. TODO: Allow this to beIra Rice1-0/+35
customizable through the color interface so that if someone is colorblind to a certain color and it doesn't show up well, they can change it (or even people who just don't like the default color). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Fixed a slight error in item name widths.Ira Rice1-3/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Consolidated setMinWidth into textWrap, since all lines are dependantIra Rice1-21/+20
upon knowing what dimension they have to wrap to or beat in order for text wrapping to work. By adding this to be initiated at the same time as the text wrapping is done, this should decrease visual artifacts caused by not initializing it properly to begin with. Also made the item popups compact to the minimum dimension. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Bolded item names in the item popup. TODO: Modify this later to alsoIra Rice1-0/+1
color the item name based on general function, like speech bubbles do for being names. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Modified item popups to show the weight of the item as well. TODO:Ira Rice1-14/+57
modify itemdb to pull the item weight information from the server instead of the client, so as to always have the server and client in sync. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Fixed y positioning so that popups don't run off of the screen (oldIra Rice1-2/+2
behavior overprotected the bottom of the window, but didn't protect the top at all. Forgot to fix for that earlier) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Changed item popup drawing to be based on the mouse position, not windowIra Rice1-0/+14
position. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added WoW style item adding to chat window. Right click, then leftDavid Athay1-3/+3
clicking on add to chat to put the item in the chat input. Left click the item link to show a popup description, and click the link again to remove the popup.
2009-01-15Fixed Item Popup window transparency (double setting of the skin)Ira Rice1-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15A little bit of code cleanup/simplification.Ira Rice1-9/+8
TODO: Figure out how the itempopup transparency is broken and fix it (broken on code import). Best guess would be that the window is attached to a widget which is then attached to a window, causing a break in updates to the transparency code. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Integrated the ItemPopup class from Legends of Mazzeroth.Ira Rice1-0/+119
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice1-113/+0
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-13Added WoW style item adding to chat window. Right Ctrl and Left click to put ↵David Athay1-8/+5
the item in the chat input. Left click the item link to show a popup description, and click the link again to remove the popup.
2009-01-13Correct headers of Legend of Mazzeroth filesThorbjørn Lindeijer1-7/+7
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-6/+4
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-16Whitespace and indentation fixesBjørn Lindeijer1-22/+22
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-25Forgot to merge in the new files and resources into trunk.Ira Rice1-0/+115
2008-07-01Ported some GUI improvements from Legend of Mazeroth (GUI skinning via XML ↵Philipp Sehmisch1-0/+116
files, item descriptions on mouse-over, map names in minimap window, speech bubbles)