Skip to content

Add optional horizontal (landscape) layout mode #431

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

Open
kfezer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add optional horizontal (landscape) layout mode #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions docs/docs/modules.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,28 @@ Each module entry in `settings.json` uses this structure:
}
```

## Layout direction

By default, modules are stacked top-to-bottom in the display's native
orientation swapped to portrait. Set a top-level `"layout": "horizontal"` in
`settings.json` to keep the display's native (landscape) orientation instead
and tile modules left-to-right:

```json
{
"layout": "horizontal",
"modules": [
{ "position": 1, "name": "Calendar", "config": { "size": [550, 964], ... } },
{ "position": 2, "name": "Xkcd", "config": { "size": [754, 964], ... } }
]
}
```

Each module's `size` is then interpreted as `[column width, full height]`
instead of `[full width, row height]`. Omitting `layout` (or setting it to
anything other than `"horizontal"`) keeps the original vertical-stacking
behavior unchanged.

## Module docs

- `modules/agenda.md`
Expand Down
52 changes: 33 additions & 19 deletions inkycal/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,12 +492,18 @@ def _assemble(self):
# Create 2 blank images with the same resolution as the display
width, height = Display.get_display_size(self.settings["model"])

# Since Inkycal runs in vertical mode, switch the height and width
width, height = height, width
# "layout": "horizontal" keeps the display's native (landscape) orientation
# and tiles modules left-to-right instead of top-to-bottom. Default/absent
# keeps the original vertical-stacking behavior unchanged.
layout = self.settings.get('layout', 'vertical')

if layout != 'horizontal':
# Since Inkycal runs in vertical mode by default, switch the height and width
width, height = height, width

canvas = Canvas(im_size=(width, height), font=FONTS.default, font_size=14)

# Set cursor for y-axis
# Set cursor for the stacking axis (y-axis for vertical, x-axis for horizontal)
im1_cursor = 0
im2_cursor = 0

Expand All @@ -517,20 +523,24 @@ def _assemble(self):
# Get the size of the section
section_size = [i for i in self.settings['modules'] if i['position'] == number][0]['config']['size']

# Calculate coordinates to center the image
x = int((section_size[0] - im1_size[0]) / 2)

# If this is the first module, use the y-offset
if im1_cursor == 0:
if layout == 'horizontal':
x = im1_cursor + int((section_size[0] - im1_size[0]) / 2)
y = int((section_size[1] - im1_size[1]) / 2)
else:
y = im1_cursor + int((section_size[1] - im1_size[1]) / 2)
# Calculate coordinates to center the image
x = int((section_size[0] - im1_size[0]) / 2)

# If this is the first module, use the y-offset
if im1_cursor == 0:
y = int((section_size[1] - im1_size[1]) / 2)
else:
y = im1_cursor + int((section_size[1] - im1_size[1]) / 2)

# center the image in the section space
canvas.image_black.paste(im1, (x, y), im1)

# Shift the y-axis cursor at the beginning of next section
im1_cursor += section_size[1]
# Shift the cursor at the beginning of next section
im1_cursor += section_size[0] if layout == 'horizontal' else section_size[1]

# Check if there is an image for the coloured band
if os.path.exists(im2_path):
Expand All @@ -542,20 +552,24 @@ def _assemble(self):
# Get the size of the section
section_size = [i for i in self.settings['modules'] if i['position'] == number][0]['config']['size']

# Calculate coordinates to center the image
x = int((section_size[0] - im2_size[0]) / 2)

# If this is the first module, use the y-offset
if im2_cursor == 0:
if layout == 'horizontal':
x = im2_cursor + int((section_size[0] - im2_size[0]) / 2)
y = int((section_size[1] - im2_size[1]) / 2)
else:
y = im2_cursor + int((section_size[1] - im2_size[1]) / 2)
# Calculate coordinates to center the image
x = int((section_size[0] - im2_size[0]) / 2)

# If this is the first module, use the y-offset
if im2_cursor == 0:
y = int((section_size[1] - im2_size[1]) / 2)
else:
y = im2_cursor + int((section_size[1] - im2_size[1]) / 2)

# center the image in the section space
canvas.image_colour.paste(im2, (x, y), im2)

# Shift the y-axis cursor at the beginning of next section
im2_cursor += section_size[1]
# Shift the cursor at the beginning of next section
im2_cursor += section_size[0] if layout == 'horizontal' else section_size[1]

# Add info-section if specified --

Expand Down
Loading