Commit graph

451 commits

Author SHA1 Message Date
Nimetu
11442b15ae Change table defaults valign=middle, cellpadding=1, cellspacing=2 2014-10-15 00:02:38 +03:00
Nimetu
66ca072948 Render table with rowspan, colspan.
Borders, if enabled, adds +1 to cell padding.
2014-10-14 15:29:06 +03:00
Nimetu
23d51172c2 Add rowspan and colspan attributes 2014-10-14 15:26:14 +03:00
dfighter1985
284de64589 When creating a new GUI set the base color to white. 2014-10-13 17:47:42 +02:00
dfighter1985
b8d16d8b9b Pos and Size parent setters should now use the widget directly as well. 2014-10-13 15:43:10 +02:00
dfighter1985
126631020f Size parent is now queried directly from the widget. 2014-10-13 15:26:47 +02:00
Nimetu
d938a90da6 Render table and cell borders 2014-10-13 01:59:20 +03:00
Nimetu
13b947861d Add bordercolor attribute to table tag 2014-10-13 01:10:46 +03:00
dfighter1985
cc3e44ac2b GUI Editor should show the right parent position. 2014-10-12 23:07:08 +02:00
dfighter1985
a96cdafb29 Parent positions should now be saved right again. 2014-10-12 23:05:22 +02:00
Nimetu
80e2d7fa35 Fix table cellpadding 2014-10-12 17:43:18 +03:00
dfighter1985
479625968d Implemented new action. 2014-10-11 21:43:28 +02:00
dfighter1985
f5826add20 Moved CRootGroup out of CInterfaceParser. 2014-10-11 19:30:30 +02:00
dfighter1985
c47188179a CInterfaceParser in editor mode should look for files in the working directory first. 2014-10-11 16:26:38 +02:00
dfighter1985
f6d34ddb37 Added limits to pch, should fix Linux build. 2014-10-11 13:04:03 +02:00
dfighter1985
c7bfb9cf20 Merged develop 2014-10-11 02:15:07 +02:00
dfighter1985
6c05ced558 Added support for grouping widgets. 2014-10-11 00:42:43 +02:00
dfighter1985
0aead6db70 Allow multiselection. 2014-10-10 20:25:25 +02:00
dfighter1985
20ccee370b Unselect selection when clicking 'nothing'. 2014-10-10 17:33:57 +02:00
kaetemi
a1262b71b2 Handle shadow outline in gui 2014-10-08 23:20:35 +02:00
dfighter1985
733fb56703 A little crash fix. 2014-10-08 21:28:20 +02:00
dfighter1985
a4dfd8c95e Sizes should remain the same when ungrouping. 2014-10-08 21:00:56 +02:00
dfighter1985
003ddd6881 Added support for ungrouping. 2014-10-08 20:36:16 +02:00
dfighter1985
e9f5fef158 Make group selection optional. 2014-10-08 18:45:17 +02:00
dfighter1985
01cdcaa480 Only select a group first in editor mode. 2014-10-08 18:00:54 +02:00
dfighter1985
b524c9fec1 Don't try to handle the right mouse button actions in editor mode. 2014-10-08 17:59:39 +02:00
dfighter1985
1111a022af When moving a group draw it's children too. 2014-10-08 17:52:56 +02:00
dfighter1985
4d06c3c278 Select groups first. 2014-10-08 17:37:05 +02:00
kaetemi
6ec644e2ba Fix rendering of specially sized window highlights 2014-10-08 09:31:13 +02:00
kaetemi
d2e9352d4c Fix when tx_b and tx_b_open have different heights 2014-10-08 09:30:59 +02:00
kaetemi
cbe5cb66f7 Add inset_t parameter to layer options, allows putting header graphics in top texture 2014-10-04 01:43:27 +02:00
kaetemi
96ea88ac07 Fix a bad copy paste in NLGUI 2014-10-04 01:43:13 +02:00
dfighter1985
7504dc1238 From now on dragged widgets will be re-aligned on drop. They will find the nearest hotspot of the group they are dropped into, and calculate an offset so they will align to the hotspot and yet remain where they were dropped. 2014-09-29 20:29:04 +02:00
dfighter1985
4d5d67fac7 Update CCtrlTextButton's CViewText's coords after updating it's own coords. 2014-09-29 17:38:24 +02:00
dfighter1985
2383e19561 Posref changes in the editor should apply... 2014-09-29 17:23:22 +02:00
dfighter1985
e87d83bccc Refactoring. Added CInterfaceFactory. 2014-09-27 21:48:51 +02:00
dfighter1985
fada6e7dcc A little refactoring. 2014-09-27 20:15:46 +02:00
dfighter1985
75047b71b4 Move the text too with the text button. 2014-09-27 19:54:19 +02:00
Nimetu
2b02fd2c37 Add maxlength attribute to input and textarea tags 2014-09-27 15:55:57 +03:00
dfighter1985
3fbe51185f Merged develop. 2014-09-27 00:08:06 +02:00
dfighter1985
161c8e5edc Editbox selection should be stopped when the mouse button goes up, even if it happens outside of the box. 2014-09-26 23:29:38 +02:00
dfighter1985
e6f4801129 Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves. 2014-09-24 23:32:24 +02:00
dfighter1985
f7825fc8b3 No need for free floating elements when we can simply reparent to the top window... 2014-09-24 22:59:40 +02:00
dfighter1985
c5b8f30bb9 Orphaned widgets won't get stuck. 2014-09-24 20:40:37 +02:00
dfighter1985
f30054a26c Add widget to a new parent when the widget being dragged is dropped, otherwise add it to the orphanlist so that it's drawn anyways. NOTE: The dropped widget can be clipped. If it is clipped, it never shows up even tho it's there. 2014-09-24 18:45:52 +02:00
dfighter1985
49d023d273 Set dragged widgets' coordinates based on the move rather than the mouse pointer's coords. 2014-09-24 16:31:26 +02:00
dfighter1985
574d24e5e3 Dragged elements will no longer disappear. 2014-09-24 16:20:25 +02:00
kaetemi
3158f6d90e Handle GUI event only once 2014-09-23 19:47:06 +02:00
dfighter1985
e40ecbda00 Merged the gui-editor branch. 2014-09-17 21:12:14 +02:00
kaetemi
119c931738 Link group_wheel.cpp, ref #176 2014-08-25 14:56:29 +02:00
dfighter1985
8971f98722 Merged default. 2014-07-22 00:15:50 +02:00
Laszlo Kis-Adam
606f0f483f Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94)
Just too lazy to push directly
2014-10-15 19:48:23 +02:00
kaetemi
de026fe48c Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix) 2014-10-14 23:45:08 +02:00
kaetemi
32a144a282 Shadow should not be taken into account for font height, breaks vertical centering 2014-10-14 23:45:08 +02:00
dfighter1985
2ca6c73d09 Texture chooser now supports atlas textures as well. 2014-07-09 21:07:12 +02:00
kaetemi
3650ef83b7 Fix #162: Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
dfighter1985
668bbc1780 Added facilities for viewing the loaded actions. 2014-07-02 22:27:04 +02:00
dfighter1985
0dfb7a091c Quelled some compiler compliants. 2014-06-29 03:01:43 +02:00
dfighter1985
c8c162308d tooltip parent is now changable using an enum. 2014-06-29 02:53:33 +02:00
dfighter1985
5deea1a13b Tooltip posrefs are now enums in the GUI Editor. 2014-06-29 01:44:06 +02:00
dfighter1985
afd1d96363 text posref is now an enum too. 2014-06-27 00:07:44 +02:00
dfighter1985
87778c86c9 Posref can now be set as an enum, instead of a string in the property editor. 2014-06-21 18:25:14 +02:00
kaetemi
9e0b573141 Exit with error 2014-06-21 05:46:20 +02:00
kaetemi
fa373017f8 Fix NeL GUI compile under MinGW 2014-06-19 00:40:29 +02:00
kervala
eedaee3da3 Changed: Replaced strlwr by toLower 2014-04-24 22:59:29 +02:00
kervala
22374fb124 Fusion avec default 2014-04-24 19:16:42 +02:00
kervala
4da04fdfaa Changed: Replaced strlwr by toLower 2014-04-24 18:11:16 +02:00
dfighter1985
916c9bf919 We can now drag elements, they will disappear and whatnot, but at least they can be dragged! 2014-04-21 19:30:33 +02:00
dfighter1985
83e0c1ceda Refactored input event handling a bit. 2014-04-20 21:41:57 +02:00
dfighter1985
8c23925246 Merge default. 2014-04-19 21:53:29 +02:00
kervala
85ab0dba81 Fixed: Switch not handled warnings 2014-03-27 15:53:19 +01:00
kervala
76d7f4b620 Changed: Typo 2014-03-22 16:23:28 +01:00
kervala
bb156457c0 Changed: Typo 2014-03-22 16:23:28 +01:00
botanic
a8cabc90d1 Fixed typo issue 60 2014-01-28 11:41:26 -08:00
botanic
8c4a6fc2da Issue #60
does seem to work better when latency is high
2014-01-26 03:20:00 -08:00
botanic
95c63bc0dd Fix for Issue #94 2014-01-26 02:57:59 -08:00
Nimetu
c37850920a Remove tooltip debug message from logs 2014-01-04 00:20:05 +02:00
Nimetu
2c38c21a40 Add deadlock counter to prevent endless loop (issue #73) 2014-01-03 19:11:49 +02:00
kervala
ca82fcfe0c Fixed: Warning with clang 2013-11-13 22:23:02 +01:00
kervala
43b87ff588 Changed: Replace strlwr by toLower 2013-11-13 21:53:21 +01:00
kervala
c2045c928d Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !) 2013-11-13 21:52:21 +01:00
kervala
b7feea6c95 Fixed: Warning with clang 2013-11-13 21:40:41 +01:00
Matt Raykowski
8c046cf4c0 Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
2013-10-19 16:02:52 -05:00
kervala
88b2a1a38d Fixed: Use multiarch library path under Linux 2013-09-30 09:11:35 +02:00
kervala
9889049239 Fixed: Some warnings 2013-09-27 16:30:55 +02:00
Quitta
3d7a7dc191 Merge with quitta-gsoc-2013 2013-09-23 00:49:16 +02:00
kervala
26370c962d Fixed: Warnings with GCC 2013-09-22 13:20:19 +02:00
kervala
df8c6e9b08 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kervala
811dca71ee Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 2013-09-08 12:52:00 +02:00
kervala
dd116afff3 Fixed: Crash when trying to display a missing texture 2013-08-26 12:33:26 +02:00
kaetemi
1ed7e4fcff Force link 2013-08-01 10:11:11 +02:00
Quitta
63db620ca6 Merge with default 2013-07-31 16:26:22 +02:00
Quitta
e3625bc4e4 Merge with default 2013-07-31 16:17:29 +02:00
Quitta
0bf8c4d526 fix for getting client working + possibly auto login for ingame part 2013-07-30 01:46:56 +02:00
kaetemi
7046b6f364 NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked 2013-07-28 21:39:54 +02:00
kaetemi
b09e28e9e0 Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets 2013-07-28 05:10:07 +02:00
kaetemi
70f83e1fb9 Parse action handler condition for interface link in advance 2013-07-28 03:02:07 +02:00
kaetemi
36c969252b Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager 2013-07-28 00:48:34 +02:00
kervala
dfbf2998b0 Fixed: lua_open() doesn't exist with Lua 5.2 2013-07-24 18:47:50 +02:00
dfighter1985
edfc2c5491 Editbox should now create it's text when added. 2013-05-11 02:40:55 +02:00
dfighter1985
9382e6d1f9 Added some defaults. 2013-05-10 22:29:47 +02:00
dfighter1985
776c95f12f The editor probably shouldn't crash when adding textbutton widget. 2013-05-10 02:10:18 +02:00
dfighter1985
2dbf68d6e4 Make sure to apply the changes, when changing properties. 2013-05-10 00:55:23 +02:00
dfighter1985
43019419af Forgot to set the parent. 2013-05-10 00:28:29 +02:00
dfighter1985
c030ad755d When adding a new widget, the correct widget is now instantiated. Also added some checks. 2013-05-09 23:57:48 +02:00
dfighter1985
101d2cc612 Some more work for widget adding support. Basically the system works, just need to make sure the proper widget is instantiated, and the defaults are loaded ( so it shows up ). 2013-05-09 05:53:14 +02:00
dfighter1985
e9d646d864 Merged default 2013-05-03 02:07:38 +02:00
kervala
8a68c5e54f Changed: Moved Ryzom detailed version in client 2013-04-29 14:46:53 +02:00
kervala
31335cc491 Fixed: PCH compilation 2013-03-31 23:36:56 +02:00
kervala
7de717f9e2 fixes #31 Luabind can't be found
Added PCH support to NeL GUI
2013-03-24 20:16:23 +01:00
dfighter1985
69954d6e8b FIXED: Deleting the CViewText of CCtrlTextButton should no longer lead to crashes. 2013-03-10 00:56:27 +01:00
dfighter1985
31c6fc459f MODIFIED: Ups, missed this. 2013-03-09 22:31:51 +01:00
dfighter1985
8c2db11be3 FIXED: Widgets will no longer get stuck in the widget hierarchy tree, when deleting their parent. 2013-03-09 22:02:31 +01:00
dfighter1985
7662138dec FIXED: It's not nice to leak memory. 2013-03-09 20:58:53 +01:00
dfighter1985
b2d052108f MODIFIED: Preliminary support for a little cleanup when removing a widget from it's parent group ( for example when moving the widget ). 2013-03-08 06:28:52 +01:00
dfighter1985
836f3c9c2c MODIFIED: Draw the highlight of the currently selected widget in editor mode. 2013-03-07 06:01:33 +01:00
dfighter1985
8af3618cbf MODIFIED: collapse the widget hierarchy tree and remove the widget from it when it's deleted. Also clear the widget properties panel. 2013-03-03 03:49:56 +01:00
dfighter1985
c15cf6375c MODIFIED: Somehow I left this here, and it prevented viewtexts from being selected. 2013-03-03 00:54:22 +01:00
dfighter1985
9003dedbe5 MODIFIED: Text buttons will now delete their text too when being deleted. 2013-03-02 23:27:17 +01:00
dfighter1985
84a4ac2f0d MODIFIED: Update property browser when selecting in the central widget. 2013-02-23 06:55:19 +01:00
dfighter1985
308bbbb0c6 MODIFIED: Views can now be selected too from the central widget. 2013-02-23 00:13:44 +01:00
dfighter1985
f55ab4e21e GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 2013-02-20 22:05:09 +01:00
mattraykowski
9048c3bb21 changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
b25d4b628f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
aa261f28a4 merging gui editor repo. 2013-02-14 09:53:06 -06:00
dfighter1985
33d84c99d7 CHANGED: Somehow lost this code part during development. 2013-02-14 12:13:32 +01:00
dfighter1985
543488b490 Merged mainline default branch changes. 2013-02-14 10:47:10 +01:00
dfighter1985
421582d386 MODIFIED: #1471 Merged mainline default to this branch. 2012-11-25 05:22:40 +01:00
dfighter1985
295ab058a5 MODIFIED: #1471 Incompatible / unincrementable iterators assert will no longer be hit in debug mode with M$ STL when updating the interface anims. 2012-11-22 22:57:37 +01:00
dfighter1985
0d27998506 CHANGED: #1471 GUI library will now build with the new externals and Visual Studio 2010. 2012-10-24 18:16:01 +02:00
dfighter1985
efb7bb5d14 CHANGED: #1471 CGroupContainer action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing. 2012-08-20 02:14:06 +02:00
dfighter1985
63a9b8503d CHANGED: #1471 CGroupWheel action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing. 2012-08-20 01:55:16 +02:00
dfighter1985
d6b99c3026 CHANGED: #1471 CGroupEditBox action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing. 2012-08-20 01:50:13 +02:00
dfighter1985
5042c99d95 CHANGED: #1471 CInterfaceGroup action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing. 2012-08-20 01:39:20 +02:00
dfighter1985
dc93bf28a9 CHANGED: #1471 CCtrlBaseButton action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing. 2012-08-20 01:29:49 +02:00
dfighter1985
c53fccf7c2 CHANGED: #1471 I probably shouldn't sacrifice the game's key config parsing on the altar of the GUI editor :P 2012-08-19 02:38:24 +02:00
dfighter1985
f9f765430e CHANGED: #1471 got rid of a crash. 2012-08-19 02:20:57 +02:00
dfighter1985
c5a8cecf7e CHANGED: #1471 Keys are now parsed from the config files, and then serialized on save. 2012-08-18 20:28:56 +02:00
dfighter1985
530a141bee CHANGED: #1471 Pointer settings are now parsed even when the particular pointer cannot be instantiated. They are also serialized when serializing the GUI. 2012-08-18 18:39:45 +02:00
dfighter1985
3a6ae1b74a CHANGED: #1471 Should be able to change text options for CCtrlTextButton. 2012-08-18 03:37:52 +02:00
dfighter1985
79e4832373 CHANGED: #1471 Serialize text options for Buttons with text too. 2012-08-18 02:46:19 +02:00
dfighter1985
8fa283ca14 CHANGED: #1471 Squashed a bug that prevented text to be displayed when hardtextformat was specified as an empty string. A.K.A hidden mines in the code. There are some more :( 2012-08-18 01:30:52 +02:00
dfighter1985
27a6716db6 CHANGED: #1471 Apparently when parsing variables, the parser changes the parsed entry, so better to re-read it from the XML-tree when caching. 2012-08-18 00:27:52 +02:00
dfighter1985
094bbd6e9a CHANGED: #1471 GUI Procedures are now serialized. 2012-08-17 21:49:54 +02:00
dfighter1985
8402f2657f CHANGED: #1471 Links are now serialized. 2012-08-17 20:36:35 +02:00
dfighter1985
ef43b498bc CHANGED: #1471 Variables are now serialized. 2012-08-17 06:10:18 +02:00
dfighter1985
ff02875d45 CHANGED: #1471 Squashed a bug that prevented many widgets from being serialized right. Therefore preventing correct display when loading the saved XML. 2012-08-17 05:11:13 +02:00
dfighter1985
8a6d621881 CHANGED: #1471 Tree/node data is now serialized. 2012-08-17 04:37:07 +02:00
dfighter1985
b8cb3c43cd CHANGED: #1471 interface options are now serialized. 2012-08-16 00:45:19 +02:00
dfighter1985
66f6979be7 CHANGED: #1471 CGroupMenu's previously unnamed children will now be named properly. 2012-08-15 18:20:54 +02:00