Skip to content

Commit

Permalink
Merge branch 'main' into mac-menubar-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Clemapfel authored Feb 8, 2024
2 parents 40e264d + 3fe2e89 commit d49d8e1
Show file tree
Hide file tree
Showing 9 changed files with 216 additions and 131 deletions.
30 changes: 12 additions & 18 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,19 @@ jobs:
- uses: julia-actions/julia-runtest@v1

docs:
name: Documentation ${{ matrix.julia-version }}
name: Documentation
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
julia-version:
- "1.7"
- "1.9"
julia-arch:
- x64
steps:
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.julia-version }}
arch: ${{ matrix.julia-arch }}
show-versioninfo: true
- uses: julia-actions/julia-buildpkg@v1
- name: Install Documenter.jl
run: julia -e "import Pkg; Pkg.add(url=\"https://github.com/JuliaDocs/Documenter.jl\"); Pkg.add(url=\"https://github.com/JuliaDocs/Mousetrap.jl\")"
- name: Build Docs
run: julia docs/make.jl
version: '1.7'
- run: julia --project=docs -e '
using Pkg;
Pkg.develop(PackageSpec(; path=pwd()));
Pkg.instantiate();
Pkg.add(url=\"https://github.com/JuliaDocs/Documenter.jl\");'
- run: julia --project=docs docs/make.jl
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ It aims to give developers of all skill levels the tools to start creating compl

> **Note**: Mousetrap is under active development. Consider participating in the development by [opening an issue](https://github.com/clemapfel/mousetrap.jl) when you encounter an error, bug, question, or missing feature.
> **Note**: February 8th, 2024: I've been having some health issues at the moment, it may take me some time to get to open issues. Mousetrap is still usable and (mostly) stable, the repo will be maintained in the immediate future to the best of my abilities. Thank you for your understanding, C.
---

## Table of Contents
Expand Down
2 changes: 1 addition & 1 deletion docs/src/01_manual/02_signals.md
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ connect_signal_clicked!(button_01, button_02) do button_01::Button, button_02::B
set_signal_clicked_blocked!(button_01, false)
end

connect_signal_clicked!(button_02) do button_02::Button, button_01::Button
connect_signal_clicked!(button_02, button_01) do button_02::Button, button_01::Button
println("02 clicked")

# block self (02)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/01_manual/04_widgets.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ set_margin_horizontal(widget, 10)
set_margin_vertical(widget, 10)

# equivalent to
set_margin(widget, 10)
set_margin!(widget, 10)
```

Where [`set_margin_horizontal!`](@ref), [`set_margin_vertical!`](@ref) set two of the margins at the same time, while [`set_margin!`](@ref) sets all four margins at once.
Expand Down
4 changes: 2 additions & 2 deletions docs/src/01_manual/09_native_rendering.md
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ To display the texture on screen, we need to bind it to a shape, and then render
texture_shape::Shape = Rectangle(Vector2f(-1, 1), Vector2f(2, 2))
set_texture!(texture_shape, texture)

add_render_tasK!(render_area, RenderTask(texture_shape))
add_render_task!(render_area, RenderTask(texture_shape))
```

How and where the texture is displayed depends on the shape's vertices **texture coordinate**. These coordinates are in `([0, 1], [0, 1])`, meaning the x- and y- component are in `[0, 1]` each. We will call this coordinate system **texture space**.
Expand Down Expand Up @@ -697,7 +697,7 @@ main() do app::Application
add_render_task!(render_area, RenderTask(shape))

# connect callback, providing our shape as `Data_t` argument
connect_signal_resize!(render_area, on_resize, shape)
connect_signal_resize!(on_resize, render_area, shape)

set_child!(window, render_area)
present!(window)
Expand Down
Loading

0 comments on commit d49d8e1

Please sign in to comment.