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

Upstreaming v9 #14

Merged
merged 15 commits into from
Aug 1, 2020
Merged

Upstreaming v9 #14

merged 15 commits into from
Aug 1, 2020

Commits on Jul 14, 2020

  1. Remove unused signal callbacks 

    Possibly these were an intention to implement game pause on alt-tab.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    a2c7a7a View commit details
    Browse the repository at this point in the history

  2. Remove unused instance variable 

    Variable is not used anywhere else, so remove it.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    b4e7274 View commit details
    Browse the repository at this point in the history

  3. Remove set_title call 

    No reason to force the title, as it is forced already by BlockParty.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    e304514 View commit details
    Browse the repository at this point in the history

  4. Rename instance variable 

    Same font is used for more than score, so stop calling it a scorefont.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    6cfbc24 View commit details
    Browse the repository at this point in the history

  5. Remove prints 

    Clutter of logs, and did not add any value
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    171774b View commit details
    Browse the repository at this point in the history

  6. Remove unused method 

    Method has no caller.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    00e2982 View commit details
    Browse the repository at this point in the history

  7. Remove unused imports

    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    c7eceed View commit details
    Browse the repository at this point in the history

  8. Port to GTK 3 - expose to draw 

    A port to GTK 3 should have changed the expose callback to a draw
callback, using the supplied cairo.Context.

Possibly reduces display update CPU cost.

Regression introduced 6af29a1
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    0d3b679 View commit details
    Browse the repository at this point in the history

  9. Port to GTK 3 - missing WindowType change 

    Port to GTK 3 did not complete all porting.

Now possible again to run the game using "python3 BlockParty.py"
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    863953e View commit details
    Browse the repository at this point in the history

  10. Port to GTK 3 - fix vanishing cursor 

    Vanishing cursor helps to avoid distraction, but it was lost in the port
to GTK 3.

Get the saved cursor from the window after it is realized.

Flush the cursor change through Gdk.

Keep the timer source identifier.

When the activity is closing, stop the timer and audio player, otherwise
the timer may trigger and VanishingCursor may try to restore the cursor
while there is no window for the Gtk.DrawingArea, yielding traceback.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    7291839 View commit details
    Browse the repository at this point in the history

  11. Scale font to Sugar configuration 

    Sugar has a configuration setting for font face and size, so use it
rather than a pre-coded face and size.

Also scale according to display size relative to the 900 pixel width of
the OLPC XO-1.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    4d76253 View commit details
    Browse the repository at this point in the history

  12. Use Gtk.DrawingArea for game 

    We're odd, because we draw on Gtk.Window.  Makes it impossible to add a
Sugar toolbar.  Instead, let's draw on the new Gtk.DrawingArea widget.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    2331989 View commit details
    Browse the repository at this point in the history

  13. Add Sugar toolbar 

    Also avoid dropping unhandled key press events (return True), as it
prevented the ctrl+q stop accelerator from working.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    a1bedfa View commit details
    Browse the repository at this point in the history

  14. Fit game within canvas 

    Adjust height by the expected size of the toolbar.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    a36ea19 View commit details
    Browse the repository at this point in the history

  15. Centre activity icon 

    Icon is the "T" tetronimo, upside down, with extra gap between the
squares.

Squares in the icon were not distributed evenly across the available
dimensions, and the shape centre was above and to the right of the icon
centre.
    @quozl
    quozl committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    fc6efe4 View commit details
    Browse the repository at this point in the history