Merge pull request #322 from ioriayane/fix_calculation

サイズ調整の値を整数に調整
ioriayane · Jan 3, 2025 · 047e61b · 047e61b
2 parents 3fbe9b2 + 03127bd
commit 047e61b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 32 deletions.
diff --git 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
 }
diff --git 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

diff --git 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
@@ -13,6 +13,7 @@ description: マルチカラム対応Blueskyクライアント
 - 更新
   - 動画のアイコンを変更
   - ラベルの表示内容を変更
+  - 表示サイズを調整する値の計算処理を変更
 
 ### v0.42.0 - 2024/12/22