Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

feature: New Collage layout #108

Merged
merged 9 commits into from Sep 19, 2020
Merged

feature: New Collage layout #108

merged 9 commits into from Sep 19, 2020

Conversation

andi34
Copy link
Owner

@andi34 andi34 commented Sep 14, 2020

Prerequisites checklist

What is the purpose of this pull request? (put an "x" next to an item)

  • New feature

What changes did you make? (Give an overview)

Implementation for collage layout options by alzo425: alzo425@90099f1
Partially applied changes from @KH404: (andreknieriem#258)

Adjustments:

  • Only use collage related changes.
  • Fixed spaces.
  • Adjusted config.
  • Fixed Windows compatibility.
  • allow to apply frame once or to every picture

Is there anything you'd like reviewers to focus on?

Fix andreknieriem#164
Partially fixes #82

2x2

20200918_195631

2x4

20200918_195539

2x4 + background image

20200918_195411

@andi34
Copy link
Owner Author

andi34 commented Sep 14, 2020

@alzo425 I've slightly adjusted your changes, hope that's ok

Implementation by alzo425: alzo425@90099f1

Adjustments:
- Only use collage related changes.
- Fixed spaces.
- Adjusted config.
- Fixed Windows compatibility.

Change-Id: Ie371872e774a9cccf4da2cf507d929f1e55db177
Change-Id: I666532f8d9ddbe69356d3935b3bbe4d86ab6ef7b
KH404 and others added 3 commits September 19, 2020 12:58
Change-Id: I9739cb98735a89256cfffd5134b5dc7b8a93b117
Change-Id: Icfea70b2925a519db9a15531db57cbafd1dd9009
Change-Id: I4679880a2b97f7a0a5e90361347805ac0196ab6a
@andi34
Copy link
Owner Author

andi34 commented Sep 19, 2020

Frame applied to every picture

20200919_140614

20200919_140726

20200919_164509

Frame applied once

20200919_140654

20200919_140757

20200919_152038

Change-Id: I8eee49d2432e4ef66ffdb525a33361fa7162b81b
…nd image

Change-Id: Ice486264d35a8a2c22f6e7cbb88c078a2a95fc9f
Change-Id: I03d2ef1a12fe7b0d3094f8cacf4117de1d90e755
@andi34 andi34 merged commit 0bcd6c0 into dev Sep 19, 2020
@andi34 andi34 deleted the feature/collage-layout branch September 19, 2020 14:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wishlist New Collage Layout
2 participants