vyn/mirai
1
Fork 0
mirror of https://codeberg.org/vyn/mirai.git synced 2025-07-02 01:13:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tasks view resizing for no reason + Wrap text correctly

Browse source
This commit is contained in:
Vyn 2025-06-18 13:54:33 +02:00
parent e4b03ca418
commit f8ff4eb3c4
Signed by: vyn
GPG key ID: E1B2BE34E7A971E7
5 changed files with 141 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/selenite vendored

@ -1 +1 @@
Subproject commit b549a6a47c543ca83d7d37027e55ecd782781e11
Subproject commit acbd56205d758bf74d7f121ce8085898acbacc9f

2
src/components/CreateTaskOrEvent.slint
View file

@ -37,7 +37,7 @@ export component CreateTaskOrEvent inherits Rectangle {
duration: 250ms;
}
newTaskTitleInput := VTextInput {
placeholder: "Add new Task / Event";
placeholder: "Enter new task";
started-writting() => {
sourceInput.current-index = AppWindowModels.default-source-index;
}

7
src/windows/AppWindow/AppWindow.slint
View file

@ -12,15 +12,15 @@ import { VButton } from "../../../external/selenite/components/Button.slint";
export component AppWindow inherits Window {
title: "Mirai";
min-height: 100px;
max-height: 4000px; // needed, otherwise the window wants to fit the content (on Swaywm)
//min-height: 100px;
//max-height: 4000px; // needed, otherwise the window wants to fit the content (on Swaywm)
background: Palette.pane;
private property<bool> show-tasks: false;
HorizontalLayout {
VerticalLayout {
HorizontalLayout {
VerticalLayout {
padding: 16px;
alignment: LayoutAlignment.stretch;
spacing: 8px;
@ -38,6 +38,7 @@ export component AppWindow inherits Window {
}
VerticalLayout {
if show-tasks : MainView {
horizontal-stretch: 1;
}

10
src/windows/AppWindow/views/CalendarView.slint
View file

@ -64,12 +64,11 @@ export component CalendarView inherits Rectangle {
}
}
VerticalLayout {
padding: 16px;
spacing: 16px;
HorizontalLayout {
alignment: start;
padding: 16px;
VButton {
text: "New event";
icon-svg: Svg.plus;
@ -79,6 +78,11 @@ export component CalendarView inherits Rectangle {
}
}
}
Rectangle {
horizontal-stretch: 1;
background: Palette.background.brighter(0.2);
height: 1px;
}
Calendar {
delete-event-request(source-id, event-id) => { debug("DEELTE", source-id);AppWindowActions.delete-event(source-id, event-id) }
init => { debug("cal len", AppWindowModels.calendar.length) }

60
src/windows/AppWindow/views/TasksView.slint
View file

@ -15,14 +15,10 @@ export component MainView inherits Rectangle {
private property<string> icon-not-visible: Svg.not-visible;
private property<bool> completed-tasks-visible: false;
HorizontalLayout {
VerticalLayout {
horizontal-stretch: 1;
padding: 16px;
spacing: 16px;
HorizontalLayout {
horizontal-stretch: 1;
alignment: start;
spacing: 8px;
VButton {
@ -55,21 +51,26 @@ export component MainView inherits Rectangle {
}
Flickable {
max-width: 9999px; // The window keeps resizing down if we don't set the max width
horizontal-stretch: 1;
VerticalLayout {
alignment: start;
spacing: 16px;
if AppWindowModels.days.length == 0 && AppWindowModels.unscheduled-tasks.length == 0 : VText {
text: "There is no task to show";
horizontal-alignment: center;
vertical-alignment: center;
}
for day[dayIndex] in AppWindowModels.days: VerticalLayout {
Rectangle {
spacing: day.tasks.length > 0 ? 16px : 0px;
if day.tasks.length > 0 : Rectangle {
if dayIndex != 0 : Rectangle {
height: 1px;
background: Palette.card-background;
}
//background: Palette.card-background;
border-radius: 8px;
VerticalLayout {
padding: 16px;
HorizontalLayout {
alignment: start;
VText {
@ -90,45 +91,7 @@ export component MainView inherits Rectangle {
}
}
}
for event[eventIndex] in day.events: VerticalLayout {
padding-top: 16px;
EventGroup {
event: event;
add-task(data) => {
AppWindowActions.create-task({
sourceId: event.sourceId,
eventId: event.id,
title: data.title,
});
}
edit-task(taskId, data) => {
AppWindowActions.save-task({
id: taskId,
sourceId: event.sourceId,
title: data.title,
});
}
delete-task(taskId) => {
AppWindowActions.delete-task-clicked(event.sourceId, taskId)
}
toggle-check-task(taskId) => {
AppWindowActions.task-clicked(event.sourceId, taskId);
}
delete => {
//AppWindowActions.delete-event-clicked(event.sourceId, event.id)
}
edit(data) => {
//AppWindowActions.save-event({
//sourceId: event.sourceId,
//id: event.id,
//title: data.title,
////date: event.date,
//startsAt: event.startsAt,
//endsAt: event.endsAt,
//});
}
}
}
for task[taskIndex] in day.tasks: VerticalLayout {
padding-top: taskIndex == 0 ? 16px : 0px;
padding-bottom: 8px;
@ -161,10 +124,9 @@ export component MainView inherits Rectangle {
}
if AppWindowModels.unscheduled-tasks.length > 0 : VerticalLayout {
Rectangle {
background: Palette.card-background;
//background: Palette.card-background;
border-radius: 8px;
VerticalLayout {
padding: 16px;
HorizontalLayout {
alignment: start;
VText {
@ -204,6 +166,4 @@ export component MainView inherits Rectangle {
}
}
}
}
}