Commit Graph

82 Commits (bce903ee0434ffae24bf02c898ab456adee9ffdf)

Author SHA1 Message Date
David Dormagen 87a824b49d inventory & interaction: added Find_Layer where appropriate 2015-09-05 11:22:23 +02:00
David Dormagen 32923188b9 interaction menu: added name of object at the top of the menu
..and also increased speed of GUI_ObjectInteractionMenu::FxIntCheckObjectsTimer by around 10%.
2015-09-04 16:53:32 +02:00
David Dormagen d8b99b8a41 interaction menu: visually disable containers on one side if they are already open on the other 2015-08-07 16:48:28 +02:00
Maikel de Vries ec6d7c173e implement transfer all objects to surroundings 2015-06-07 19:04:43 +02:00
Maikel de Vries 1db961a92c make construction site a container for interaction menu 2015-06-07 12:53:59 +02:00
David Dormagen 9236ef265c interaction menu: added buttons for "transfer all items" 2015-04-12 20:24:45 +02:00
David Dormagen 4baf849c44 stackable: always take full stack from container, fix flickering in menu while standing on uncollectable stack 2015-04-04 20:37:06 +02:00
David Dormagen 0ef6bb306b added new progress bar style to replace old pie-chart in inventory slot (when f.e. reloading) 2015-04-04 11:23:25 +02:00
David Dormagen 916e587b68 improved UI support of stackable library & extra slot 2015-03-26 12:24:48 +01:00
David Dormagen ebcc397221 add proper support (inventory & interaction-menu contents) for extra slot library
Also fix bug with GuiScriptWindow where scrollbars would not be hidden in some cases (f.e. no-crop parent and negative-top child).
2015-03-19 16:22:06 +01:00
David Dormagen d740a79ba5 polished the updating behaviour of the interaction menu; added "Your Environment" tab into interaction menu 2015-03-05 18:53:52 +01:00
David Dormagen 700f332cc0 production menu: sort items by value; fix minor bug 2015-03-01 11:30:46 +01:00
David Dormagen 6466c6d45b adapted flagpole to the interaction menu; moved some frequent checks (completion/hostility) to the interaction menu; the flag is no longer static back 2015-03-01 11:20:33 +01:00
David Dormagen f169640713 interaction menu: improved support/updating of custom entries; adapted pump & producer to interaction menu
Also fooled around with the layout of the interaction menu. Far from final though.
2015-03-01 10:27:29 +01:00
David Dormagen 047bafaa6a improved support for custom interaction menus; made pump control use the new interaction menu 2015-02-27 11:23:20 +01:00
David Dormagen 55bfecae4c interaction menu: ignore containers(/objects) that are contained themselves 2015-01-04 12:26:37 +01:00
David Dormagen bc9697ab3a worked on making the order of items in the interaction menu and action bar more consistent; changed some minor things 2015-01-03 15:32:06 +01:00
David Dormagen 44989941cd inventory menu: also show name of object in description box 2014-12-25 18:14:30 +01:00
David Dormagen 48bc48159e Script GUIs: fixed last remaining old method names 2014-10-23 23:28:06 +02:00
David Dormagen 6a875a1b29 CustomGuis: renamed several script functions to be more consistent; removed Gui_AddMargin as it is obsolete
All calls that reference an existing Gui window now start with "GuiUpdate" (exception: GuiClose). All other functions are always to be called DURING menu creation and layouting.
The "Margin" property replaces Gui_AddMargin.

find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiOpen/GuiOpen/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiClose/GuiClose/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiSetTag/GuiUpdateTag/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiUpdate/GuiUpdate/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_AddCloseButton/GuiAddCloseButton/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_UpdateText/GuiUpdateText/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_AddSubwindow/GuiAddSubwindow/g'
2014-10-11 11:51:26 +02:00
David Dormagen 269e09fca1 object interaction menu: increase size of side-bar items 2014-03-31 20:14:08 +02:00
David Dormagen df658118cb interaction menu: fixed a zero-pointer bug in FxIntRefreshContentsMenuTimer
When the array is not copied, it can under some circumstances be manipulated in DoMenuRefresh when it is called the next time from another location than the contents-update-effect. The effect does not want the array to change, though.
2014-03-27 19:44:34 +01:00
David Dormagen 8b0e6e5292 interaction menu: further fixes and cleanups; external menus can now be integrated smoothly into the framework; the production menu is now shown in the interaction menu 2014-03-26 23:55:32 +01:00
David Dormagen 537846d76d menus: fixed two possible null-reference errors 2014-02-28 22:39:14 +01:00
David Dormagen afbaf8c6aa contents menu: fix not being able to put stuff into f.e. construction sites by ignoring the OCF check when collecting; allow Clonks to take stuff out of containers even if hand is full 2014-02-28 22:19:30 +01:00
David Dormagen 75e776cb04 custom GUIs: added "Margin" property
The property can be used to give GUI windows a margin. Either the same margin in all directions (Margin = "1em") or different margins (Margin = ["1em", "2em", "10$", "0.5em"] - [left, top, right, bottom]).
2014-02-26 22:37:12 +01:00
David Dormagen 4346da8e4e custom GUIs: replace position properties X/Y/Wdt/Hgt with Left/Right/Top/Bottom that take strings instead of arrays, also change absolute unit from pixels to em
Before you'd define the X coordinate of the top-left corner of a window with X = [500, -40], now you do Left = "50%-4em". The em values currently do not scale with font-size yet, but it is important to do the formal change as early as possible to not have to do all work twice. Scaling of font and thus menus can be implemented later.
2014-02-17 15:46:36 +01:00
David Dormagen fa4638d6c0 custom GUIs: change order of arguments of GuiAction_SetTag from (target, id, tag) to (tag, id, target) 2014-02-16 17:18:34 +01:00
David Dormagen a0a76c051d custom GUI: removed "CreateCustomMenu" which was only a wrapper for "CreateObject" - use "CreateObject" now
This should reduce the confusion about why the function behaves so differently from Gui_Open: the style objects only provide an interface for those easy GUIs, they are not really part of the GUI system.
2014-02-15 18:59:33 +01:00
David Dormagen acb35071ad Merge branch 'Controls-fix' into Controls
Conflicts:
	planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c
2014-02-15 14:42:35 +01:00
David Dormagen 50a6ca214c started work on a new interaction menu - currently only the inventory part works
TODO: add production/buying/etc. - should be easily pluggable into the framework menu
2014-02-15 14:40:53 +01:00
David Dormagen 6a04337f7c intermediate changes [TO AMMEND] 2014-02-15 14:32:42 +01:00