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

Fruxo upstream merge #6

Closed
wants to merge 28 commits into from
Closed

Fruxo upstream merge #6

wants to merge 28 commits into from

Commits on Apr 8, 2019

  1. Fix TBImage::IsEmpty

    @codecat @Zomtir
    codecat authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    1678be1 View commit details
    Browse the repository at this point in the history

  2. Removed block from element, introduced packed union 

    Conflicts:
	src/tb/tb_editfield.cpp
	src/tb/tb_style_edit.cpp
	src/tb/tb_style_edit.h
	src/tb/tb_style_edit_content.cpp
	src/tb/tb_style_edit_content.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    997991f View commit details
    Browse the repository at this point in the history

  3. Reuse TBTextProps instead of constantly reallocating. 

    Conflicts:
	src/tb/tb_style_edit.cpp
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    b507baa View commit details
    Browse the repository at this point in the history

  4. Added a few more characters as word breakers. 

    These: @$'~|?
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    bfa6064 View commit details
    Browse the repository at this point in the history

  5. Moved paint related arguments into TBPaintProps. 

    Conflicts:
	src/tb/tb_style_edit.cpp
	src/tb/tb_style_edit.h
	src/tb/tb_style_edit_content.cpp
	src/tb/tb_style_edit_content.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    6c5a43b View commit details
    Browse the repository at this point in the history

  6. Added TBSyntaxHighlighter. 

    Conflicts:
	src/tb/tb_style_edit.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    e0d0743 View commit details
    Browse the repository at this point in the history

  7. fixed compiler warnings

    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    1bacb3f View commit details
    Browse the repository at this point in the history

  8. TBWindow should have a virtual destructor 

    fixed compiler warnings
    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    f1bd0c7 View commit details
    Browse the repository at this point in the history

  9. support text-align for TBEditField 

    Conflicts:
	src/tb/tb_widgets_reader.cpp
    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    232c3f6 View commit details
    Browse the repository at this point in the history

  10. added text-align to tb_widgets_attr.tb.txt

    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    9da410e View commit details
    Browse the repository at this point in the history

  11. added missing const qualifiers

    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    ca89b1a View commit details
    Browse the repository at this point in the history

  12. use nullptr 

    Conflicts:
	Demo/platform/port_glfw.cpp
    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    663a6db View commit details
    Browse the repository at this point in the history

  13. Added some unit tests & fixed bug in TBHashTable. 

    Added missing GetNumItems and decrement count
when items are removed.

Conflicts:
	src/tb/tb_hashtable.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    13a3f8a View commit details
    Browse the repository at this point in the history

  14. API for multi touch. 

    Opt-in support for multi touch. Widgets will still only respond to
pointer/first touch events, but new API makes it possible to implement
multi touch widgets (such as action buttons, pan/zoom containers etc).

Conflicts:
	src/tb/tb_widgets.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    df39ce3 View commit details
    Browse the repository at this point in the history

  15. Merging MultiGesture with fruxo touch code

    @Zomtir
    Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    0828da2 View commit details
    Browse the repository at this point in the history

  16. Multi-touch merge adaptions

    @Zomtir
    Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    ff533f4 View commit details
    Browse the repository at this point in the history

  17. Fixed warning about missing virtual dtor 

    Conflicts:
	src/tb/tb_widgets_reader.h
    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    9399c6c View commit details
    Browse the repository at this point in the history

  18. Fixed warnings about missing override 

    Not sure about c++11 policy... but fixing this would be cool, it fills all my compile logs.
    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    a3dbfc1 View commit details
    Browse the repository at this point in the history

  19. extended TBImageManager to be able to load images from memory 

    Conflicts:
	image/tb_image_manager.h
	image/tb_image_manager.cpp
    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    6b3d033 View commit details
    Browse the repository at this point in the history

  20. Added boolean return value to ReadData 

    this allows application to test parsing before replacing existing ui
    @mgerhardy @Zomtir
    mgerhardy authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    9d8d96c View commit details
    Browse the repository at this point in the history

  21. Add tb:: prefix for making widgets outside of tb namespace 

    Conflicts:
	src/tb/tb_widgets_reader.h
    @codecat @Zomtir
    codecat authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    6f290b3 View commit details
    Browse the repository at this point in the history

  22. Minor optimization in GetGlyph. 

    Don't call GetHashId twice.
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    3dcebc7 View commit details
    Browse the repository at this point in the history

  23. Cache size in TBWidgetString. 

    Avoid remeasuring strings during painting.

Conflicts:
	src/tb/tb_widgets_common.cpp
	src/tb/tb_widgets_common.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    b391c62 View commit details
    Browse the repository at this point in the history

  24. Cache width in TBTextFragment. 

    Makes painting faster when text is selected or styled.

Will also make Reformat(false) faster (f.ex resizing a text field).

Conflicts:
	src/tb/tb_style_edit.h
	src/tb/tb_style_edit.cpp
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    7ca8072 View commit details
    Browse the repository at this point in the history

  25. Added follow_ref to CloneChildren.

    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    6f09144 View commit details
    Browse the repository at this point in the history

  26. Added TBValue::IsNull

    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    b855864 View commit details
    Browse the repository at this point in the history

  27. Added TBColor Premultiply & Unpremultiply. 

    Conflicts:
	src/tb/tb_color.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    afbb204 View commit details
    Browse the repository at this point in the history

  28. Added float dimension conversions and slightly changed calculations. 

    Round integer conversions and removed nonzero guarantee for values
that where not zero before conversion.

Unknown/mistyped unit is treated like dp instead of px.

Conflicts:
	src/tb/tb_dimension.cpp
	src/tb/tb_dimension.h
    @fruxo @Zomtir
    fruxo authored and Zomtir committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    b40b258 View commit details
    Browse the repository at this point in the history