Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync user interface structures to Toady headers #782

Merged
merged 5 commits into from
Jun 9, 2024
Merged

Sync user interface structures to Toady headers #782

merged 5 commits into from
Jun 9, 2024

Conversation

quietust
Copy link
Member

@quietust quietust commented Jun 8, 2024

I think this might be the last of them!

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 8, 2024 •
edited
Loading

The sizes of the following types have changed in this pull request. Please verify that this is intentional. Note that renamed types are not currently detected and will also be listed here.

Type Platform Previous size New size (this PR) Change
MacroScreenLoad linux64 896 560 -336
MacroScreenLoad windows64 800 464 -336
abstractitemlistst linux64 0 160 +160
abstractitemlistst windows64 0 152 +152
adv_art_specifierst linux64 0 48 +48
adv_art_specifierst windows64 0 48 +48
assign_trade_itemlistst linux64 0 24 +24
assign_trade_itemlistst windows64 0 24 +24
build_square_type linux64 0 4 +4
build_square_type windows64 0 4 +4
buildreq linux64 4200 4208 +8
buildreq windows64 4200 4208 +8
burrow_unit_selector_filter_type linux64 4 1 -3
burrow_unit_selector_filter_type windows64 4 1 -3
color_text_boxst linux64 0 32 +32
color_text_boxst windows64 0 32 +32
color_text_linest linux64 0 1538 +1538
color_text_linest windows64 0 1538 +1538
creature_interfacest linux64 480 0 -480
creature_interfacest windows64 448 0 -448
creatures_interfacest linux64 0 480 +480
creatures_interfacest windows64 0 448 +448
curses_text_boxst linux64 0 24 +24
curses_text_boxst windows64 0 24 +24
embark_finder_option linux64 4 2 -2
embark_finder_option windows64 4 2 -2
embark_neighbor_state_type linux64 0 4 +4
embark_neighbor_state_type windows64 0 4 +4
embark_skill_tab_type linux64 0 4 +4
embark_skill_tab_type windows64 0 4 +4
embark_symbol linux64 224 0 -224
embark_symbol windows64 224 0 -224
interface_breakdown_types linux64 1 4 +3
interface_breakdown_types windows64 1 4 +3
itemlistst linux64 0 24 +24
itemlistst windows64 0 24 +24
job_spec_data linux64 0 4 +4
job_spec_data windows64 0 4 +4
labor_kitchen_food_entry linux64 56 0 -56
labor_kitchen_food_entry windows64 56 0 -56
labor_kitchen_interface_food_entry linux64 0 56 +56
labor_kitchen_interface_food_entry windows64 0 56 +56
layer_object linux64 0 16 +16
layer_object windows64 0 16 +16
layer_object_buttonst linux64 0 72 +72
layer_object_buttonst windows64 0 80 +80
layer_object_listst linux64 0 72 +72
layer_object_listst windows64 0 72 +72
location_detailst linux64 0 20 +20
location_detailst windows64 0 20 +20
lookinfost linux64 0 80 +80
lookinfost windows64 0 80 +80
minimap_tile linux64 0 4 +4
minimap_tile windows64 0 4 +4
mission linux64 184 0 -184
mission windows64 184 0 -184
region_permission_type linux64 0 4 +4
region_permission_type windows64 0 4 +4
region_print_datast linux64 0 392 +392
region_print_datast windows64 0 392 +392
region_snapshotst linux64 0 72 +72
region_snapshotst windows64 0 72 +72
relationship_profile_hf_historicalst linux64 0 104 +104
relationship_profile_hf_historicalst windows64 0 104 +104
relationship_profile_hf_visualst linux64 0 160 +160
relationship_profile_hf_visualst windows64 0 160 +160
rpd_indicator_datast linux64 0 32008 +32008
rpd_indicator_datast windows64 0 32008 +32008
saverst linux64 0 96 +96
saverst windows64 0 96 +96
text_truncated linux64 424 0 -424
text_truncated windows64 424 0 -424
track_stop_profilest linux64 0 16 +16
track_stop_profilest windows64 0 16 +16
tradegoodslistst linux64 0 32 +32
tradegoodslistst windows64 0 32 +32
ui_look_list linux64 24 0 -24
ui_look_list windows64 24 0 -24
unit_list_flag linux64 4 1 -3
unit_list_flag windows64 4 1 -3
widget_folder linux64 736 1144 +408
widget_folder windows64 744 1152 +408
widget_menu linux64 448 112 -336
widget_menu windows64 384 48 -336
widget_radio_rows linux64 856 864 +8
widget_scroll_rows linux64 456 464 +8
widget_text_multiline linux64 408 384 -24
widget_text_multiline windows64 408 384 -24
widget_text_truncated linux64 0 424 +424
widget_text_truncated windows64 0 424 +424

This is an automated comment. Please leave a reply if you think that the above information is incorrect.

@myk002
Copy link
Member

myk002 commented Jun 8, 2024

once I get this merged in, do you want to take a pass at 51.01-beta14 updates? I took a pass, but when I looked though again it seems like I missed quite a bit, and I'd feel better if you looked over it as well.

@quietust
Copy link
Member Author

quietust commented Jun 8, 2024

I just realized I've been avoiding df.adventure.xml, so I should probably sync that before trying to consume the 51.01-beta14 changes.

@myk002
cannot compile type again
186ec78 
should we factor those out into separate compounds?
@myk002
fix type name
e5a9730
myk002
myk002 reviewed Jun 9, 2024
View reviewed changes
df.viewscreen.xml
<class-type type-name='widget_text_multiline' original-name='widgets::text_multiline' inherits-from='widget_text'>
<stl-vector type-name='stl-string' name='strs'/>
</class-type>
<class-type type-name='widget_text_multiline' original-name='widgets::text_multiline' inherits-from='widget_text'/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is correct because the strs vector is static... but how can widget state possibly be static like that?

This was referenced Jun 9, 2024
Merged
Merged
@myk002 myk002 merged commit afaa0fa into DFHack:master Jun 9, 2024
14 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@myk002 myk002 myk002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
50.13-r3
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@quietust @myk002