summaryrefslogtreecommitdiff
path: root/src/gui/speechbubble.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-1/+1
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-6/+14
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-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-6/+6
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Added two more options for displaying speech overhead (don't show it atIra Rice1-6/+14
all and show speech bubbles without names). Since a checkbox won't work any more for all of these modes, it's now a slider. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Whitespace fixesBjørn Lindeijer1-1/+1
Mainly removed trailing whitespace. Also small fix in header of recorder.cpp.
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-31/+16
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-2/+2
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Fixed header of speech bubble codeBjørn Lindeijer1-7/+6
2009-02-04Added destructors to some classes originally obtained from Legends ofIra Rice1-0/+7
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-04On the offchance that a player's name is longer than 130 pixels, set theIra Rice1-2/+2
mininum width for the text wrapping code to be the length of the player's name instead. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Since they're now doing the same thing, having a branch is a little bitIra Rice1-16/+6
silly. Condensed the sizing code for speech bubbles to do the same for speech bubbles of all sizes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Fix for the last commit, where I forgot to modify the set dimension andIra Rice1-4/+2
set content size functions to use the width variable. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Not sure how this happened in the first place, but this should ensureIra Rice1-1/+3
that speech bubbles are always at least as long as the name is. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-11/+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-28Consolidated setMinWidth into textWrap, since all lines are dependantIra Rice1-4/+1
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-24Minor tweak to speech bubble sizes so that small bubbles are as small asIra Rice1-2/+2
they can be and not have text run off. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Tweaks to the speech bubbles so that being status (GM, mob, npc,Ira Rice1-21/+31
regular player) is displayed in the speech bubbles now. No need to view your own name to be able to see whether you're showing as a GM now. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Updated DejaVuSans ttf file, as well as adding the bolded version, whichIra Rice1-7/+18
is used in a few spots. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Trim displayed speech to not show links.Ira Rice1-5/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-08Made remaining dialogs translatableBjørn Lindeijer1-1/+3
Most strings are now translatable. Please do report any missing ones. Strings excluded from translation are anything that gets written to the log file or is otherwise not shown in the GUI. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-11-21Changed windowing code to allow for multiple skins. This will be Ira Rice1-2/+2
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-2/+0
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-10-12This commit contains three things: one, after looking over how TMW was Ira Rice1-1/+6
handling the effects through the level up system, I determined that it wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page css so that it better matches the forum. And three, I patched text wrapping so that it'll fix up its display size based on all previous lines, except for the last line. That fix will come later, but for now, it'll be seen as a special case. While you'd like to think that just resending the string and starting the function over again would fix it, you'd be wrong. So it won't be patched until I think of a better way to handle that case.
2008-10-10Did a little bit of code cleanup (mostly from TMW changes) as well as Ira Rice1-5/+3
properly implemented line wrapping. Now, there are no more visual artifacts for speech boxes, and it always chooses the most optimal box size (which required that npc_text use it also. Do any other gui classes use the textbox class?).
2008-09-25Forgot to merge in the new files and resources into trunk.Ira Rice1-0/+92