From 7c12de722d3a6d998e72fe83507da3458b70dd70 Mon Sep 17 00:00:00 2001 From: Takayuki Orito Date: Sat, 4 Jan 2025 01:07:31 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=E3=81=AE=E5=80=A4=E3=82=92=E6=95=B4=E6=95=B0=E3=81=AB?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/qml/data/AdjustedValues.qml | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/app/qml/data/AdjustedValues.qml b/app/qml/data/AdjustedValues.qml index e1d198ec..deb43596 100644 --- a/app/qml/data/AdjustedValues.qml +++ b/app/qml/data/AdjustedValues.qml @@ -6,47 +6,47 @@ QtObject { property real ratioHalf: 1.0 + (ratio - 1.0) / 2 // for Button - property real b55: 66 * ratio - property real b36: 42 * ratio - property real b30: 36 * ratio - property real b26: 32 * ratio - property real b24: 28 * ratio + property int b55: 66 * ratio + property int b36: 42 * ratio + property int b30: 36 * ratio + property int b26: 32 * ratio + property int b24: 28 * ratio // for Icon - property real i60: 72 * ratio - property real i50: 60 * ratio - property real i48: 56 * ratio - property real i36: 42 * ratio - property real i32: 38 * ratio - property real i24: 28 * ratio - property real i20: 24 * ratio - property real i18: 22 * ratio - property real i16: 20 * ratio - property real i12: 14 * ratio - property real i10: 12 * ratio + property int i60: 72 * ratio + property int i50: 60 * ratio + property int i48: 56 * ratio + property int i36: 42 * ratio + property int i32: 38 * ratio + property int i24: 28 * ratio + property int i20: 24 * ratio + property int i18: 22 * ratio + property int i16: 20 * ratio + property int i12: 14 * ratio + property int i10: 12 * ratio // for Font - property real f14: 16 * ratio - property real f12: 14 * ratio - property real f10: 12 * ratio - property real f8: 10 * ratio - property real f6: 8 * ratio + property int f14: 16 * ratio + property int f12: 14 * ratio + property int f10: 12 * ratio + property int f8: 10 * ratio + property int f6: 8 * ratio // for header - property real h32: 38 * ratio - property real h24: 28 * ratio + property int h32: 38 * ratio + property int h24: 28 * ratio // for spacing - property real s20: 24 * ratio - property real s15: 18 * ratio - property real s10: 12 * ratio - property real s5: 6 * ratio + property int s20: 24 * ratio + property int s15: 18 * ratio + property int s10: 12 * ratio + property int s5: 6 * ratio // others - property real v96: 116 * ratio - property real v72: 86 * ratio - property real v48: 58 * ratio - property real v24: 28 * ratio + property int v96: 116 * ratio + property int v72: 86 * ratio + property int v48: 58 * ratio + property int v24: 28 * ratio property real maximumFlickVelocity: 2500 } From 0dcc2cc06c5cd12308086d9c8881c4f8761e0876 Mon Sep 17 00:00:00 2001 From: Takayuki Orito Date: Sat, 4 Jan 2025 01:07:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=83=97=E3=83=AC?= =?UTF-8?q?=E3=83=93=E3=83=A5=E3=83=BC=E3=81=AE=E9=AB=98=E3=81=95=E8=A8=88?= =?UTF-8?q?=E7=AE=97=E3=81=A7parseInt=E3=82=92=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/qml/parts/ImagePreview.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/qml/parts/ImagePreview.qml b/app/qml/parts/ImagePreview.qml index 40287c50..a05b141a 100644 --- a/app/qml/parts/ImagePreview.qml +++ b/app/qml/parts/ImagePreview.qml @@ -67,7 +67,7 @@ Frame { property bool isWide: false property bool isTall: false Layout.preferredWidth: isWide ? imagePreviewLayout.layoutWidth : imagePreviewLayout.cellWidth - Layout.preferredHeight: isTall ? (imagePreviewLayout.layoutWidth * ( + Layout.preferredHeight: isTall ? parseInt(imagePreviewLayout.layoutWidth * ( model.index < embedImageRatios.length ? parseFloat(embedImageRatios[model.index]) : (sourceSize.height / sourceSize.width) ) ) : imagePreviewLayout.cellWidth From 03127bd35086723453e988fc6ad585d45f101b00 Mon Sep 17 00:00:00 2001 From: Takayuki Orito Date: Sat, 4 Jan 2025 02:05:46 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/content/docs/release-note.en.md | 1 + web/content/docs/release-note.ja.md | 1 + 2 files changed, 2 insertions(+) diff --git a/web/content/docs/release-note.en.md b/web/content/docs/release-note.en.md index 080f1742..b1f7fc0b 100644 --- a/web/content/docs/release-note.en.md +++ b/web/content/docs/release-note.en.md @@ -13,6 +13,7 @@ description: This is a multi-column Bluesky client. - Update - Change the video icon - Change the label display content + - Change the calculation process for adjusting the display size ### v0.42.0 - 2024/12/22 diff --git a/web/content/docs/release-note.ja.md b/web/content/docs/release-note.ja.md index 20bed164..a0aff54f 100644 --- a/web/content/docs/release-note.ja.md +++ b/web/content/docs/release-note.ja.md @@ -13,6 +13,7 @@ description: マルチカラム対応Blueskyクライアント - 更新 - 動画のアイコンを変更 - ラベルの表示内容を変更 + - 表示サイズを調整する値の計算処理を変更 ### v0.42.0 - 2024/12/22