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

Merge gui branch into master #9

Merged
merged 26 commits into from Aug 9, 2020
Merged

Merge gui branch into master #9

merged 26 commits into from Aug 9, 2020

Commits on Jun 11, 2020

  1. Add GUI skeleton based on gi-gtk-declarative.

    @rgleichman
    rgleichman committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    d267937 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Add GUI skeleton based on gi-gtk-declarative.

    @rgleichman
    rgleichman committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    2c5796c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gui' of github.com:rgleichman/glance into gui

    @rgleichman
    rgleichman committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    1779176 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2020

  1. Update stackage and add diagrams-gtk dependency.

    @rgleichman
    rgleichman committed Jun 21, 2020
    Configuration menu
    Copy the full SHA
    d0a1a59 View commit details
    Browse the repository at this point in the history

  2. Revert "Update stackage and add diagrams-gtk dependency." 

    This reverts commit d0a1a59.
    @rgleichman
    rgleichman committed Jun 21, 2020
    Configuration menu
    Copy the full SHA
    1398388 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. GUI mouse experiment.

    @rgleichman
    rgleichman committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    826a845 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

  1. Add Drag.hs.

    @rgleichman
    rgleichman committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    c278d9a View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Use motionNotifyEvent on the Layout for Drag.hs.

    @rgleichman
    rgleichman committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    9a859fc View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. In the GUI, Nodes are created by right clicking. Nodes can can be mov… 

    …ed by left clicking on them.
    @rgleichman
    rgleichman committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    e6faa23 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2020

  1. Add Cairo example from haskell-gi.

    @rgleichman
    rgleichman committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    d02e376 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2020

  1. Add Cairo drawing to Drag.hs. Make GtkPerfTest to demonstrate Gtk per… 

    …formance issues.
    @rgleichman
    rgleichman committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    26d18e0 View commit details
    Browse the repository at this point in the history

  2. Add ListBox of InBtn, MoveBtn & OutBtn

    @pel-daniel @rgleichman
    pel-daniel authored and rgleichman committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    a4a7e6d View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2020

  1. Put code in gui/Main.hs. Use Cairo for graphics.

    @rgleichman
    rgleichman committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    59ee011 View commit details
    Browse the repository at this point in the history

  2. Draw node with Cairo (#6) 

    * Add ListBox of InBtn, MoveBtn & OutBtn

* Delete Drag.hs

* Create nodes with cairo. Get mouse position with gdk
    @pel-daniel
    pel-daniel committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    49964e0 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2020

  1. Add FPS counter.

    @rgleichman
    rgleichman committed Aug 2, 2020
    Configuration menu
    Copy the full SHA
    50d9c2e View commit details
    Browse the repository at this point in the history

  2. Print elementId when left clicked (#7) 

    Co-authored-by: Robbie Gleichman <rgleichman@gmail.com>

Co-authored-by: Robbie Gleichman <rgleichman@gmail.com>
    @pel-daniel @rgleichman
    pel-daniel and rgleichman committed Aug 2, 2020
    Configuration menu
    Copy the full SHA
    4a6d95a View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2020

  1. Add comment that z is unused and fix warning.

    @rgleichman
    rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    a412fec View commit details
    Browse the repository at this point in the history

  2. Move findElementsByPosition

    @rgleichman
    rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    523aab0 View commit details
    Browse the repository at this point in the history

  3. Add dummy updateState function.

    @rgleichman
    rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    8fcd96a View commit details
    Browse the repository at this point in the history

  4. Rename state IO ref to stateRef.

    @rgleichman
    rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    cabc258 View commit details
    Browse the repository at this point in the history

  5. Move the _asMovingNode to the mouse position.

    @rgleichman
    rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    d74a40f View commit details
    Browse the repository at this point in the history

  6. Fix hlint warnings.

    @rgleichman
    rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    1faf77d View commit details
    Browse the repository at this point in the history

  7. Drag node at the middle

    @pel-daniel @rgleichman
    pel-daniel authored and rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    5a0e602 View commit details
    Browse the repository at this point in the history

  8. Toggle _asMovingNode when clicked

    @pel-daniel @rgleichman
    pel-daniel authored and rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    6452458 View commit details
    Browse the repository at this point in the history

  9. Extract mousePosition & time from appState 

    Co-authored-by: Robbie Gleichman <rgleichman@gmail.com>
    @pel-daniel @rgleichman
    pel-daniel and rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    ea67d5a View commit details
    Browse the repository at this point in the history

  10. Extract timeoutCallback function 

    Co-authored-by: Robbie Gleichman <rgleichman@gmail.com>
    @pel-daniel @rgleichman
    pel-daniel and rgleichman committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    6194cb9 View commit details
    Browse the repository at this point in the history