From be07b1e236374531224913e54d0003ded3d55cd7 Mon Sep 17 00:00:00 2001
From: Bardia Daneshvar <realbardiax@gmail.com>
Date: Thu, 2 Mar 2017 18:24:47 +0330
Subject: [PATCH] Bugfixes

---
 android-build/res/values/style.xml            |  3 +++
 .../land/aseman/android/AsemanActivity.java   |  2 --
 asemanapplication.cpp                         | 21 +++++++++++++++----
 asemandevices.cpp                             | 11 ++++++----
 qml/AsemanTools/CachedImage.qml               |  1 +
 qml/AsemanTools/Controls/Frame.qml            |  1 +
 qml/AsemanTools/MaterialDesignButton.qml      |  1 +
 qml/AsemanTools/SlidePageManager1_1.qml       |  2 +-
 .../private/MaterialDesignButtonItem.qml      |  1 +
 9 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/android-build/res/values/style.xml b/android-build/res/values/style.xml
index 96c6447..a0186f1 100644
--- a/android-build/res/values/style.xml
+++ b/android-build/res/values/style.xml
@@ -2,6 +2,9 @@
 <resources>
     <style name="splashScreenTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:adjustViewBounds">true</item>
+        <item name="android:scaleType">centerCrop</item>
     </style>
 
 <!--    
diff --git a/android-build/src/land/aseman/android/AsemanActivity.java b/android-build/src/land/aseman/android/AsemanActivity.java
index 64c4afd..215c9b5 100644
--- a/android-build/src/land/aseman/android/AsemanActivity.java
+++ b/android-build/src/land/aseman/android/AsemanActivity.java
@@ -199,8 +199,6 @@ public String getPath(Uri uri) {
     public void onCreate(Bundle savedInstanceState)
     {
         Window w = getWindow();
-        w.getDecorView().setBackgroundColor(0xff111111);
-
         int resID = getResources().getIdentifier("splash" , "drawable", getPackageName());
         if(resID != 0)
             w.setBackgroundDrawableResource(resID);
diff --git a/asemanapplication.cpp b/asemanapplication.cpp
index f42fadb..e43d47f 100644
--- a/asemanapplication.cpp
+++ b/asemanapplication.cpp
@@ -171,15 +171,26 @@ AsemanApplication::AsemanApplication(int &argc, char **argv, ApplicationType app
     if(!aseman_app_singleton)
         aseman_app_singleton = this;
 
-#ifdef Q_OS_ANDROID
 #ifndef FORCE_ASEMAN_DENSITY
+#ifdef Q_OS_ANDROID
+    const bool nexus5X = (AsemanJavaLayer::instance()->deviceName() == "LGE Nexus 5X");
+    if(!nexus5X)
+        QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
     if(!QGuiApplication::testAttribute(Qt::AA_EnableHighDpiScaling) && qgetenv("QT_SCALE_FACTOR").isNull() && qgetenv("ASEMAN_SCALE_FACTOR").isNull())
     {
         qreal ratio = AsemanJavaLayer::instance()->density()*(AsemanDevices::isTablet()? 1.28 : 1);
-        qreal newRatio = qRound((ratio*20) + 0.01)/20.0;
-        qputenv("QT_SCALE_FACTOR",QByteArray::number(newRatio));
-        qputenv("ASEMAN_SCALE_FACTOR",QByteArray::number(ratio/newRatio));
+        if(nexus5X)
+        {
+            qreal newRatio = qRound((ratio*20) + 0.01)/20.0;
+            qputenv("QT_SCALE_FACTOR",QByteArray::number(newRatio));
+            qputenv("ASEMAN_SCALE_FACTOR",QByteArray::number(ratio/newRatio));
+        }
+        else
+            qputenv("QT_SCALE_FACTOR",QByteArray::number(ratio));
     }
+#else
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
 #endif
 
@@ -218,11 +229,13 @@ AsemanApplication::AsemanApplication(int &argc, char **argv, ApplicationType app
 
 void AsemanApplication::init()
 {
+#ifndef FORCE_ASEMAN_DENSITY
     if(!qgetenv("ASEMAN_SCALE_FACTOR").isNull())
         AsemanDevices::setFlag(AsemanDevices::AsemanScaleFactorEnable);
     else
     if(!qgetenv("QT_SCALE_FACTOR").isNull())
         AsemanDevices::setFlag(AsemanDevices::DisableDensities);
+#endif
 
     switch(p->appType)
     {
diff --git a/asemandevices.cpp b/asemandevices.cpp
index 22d0942..2c9e427 100644
--- a/asemandevices.cpp
+++ b/asemandevices.cpp
@@ -375,8 +375,11 @@ qreal AsemanDevices::standardTitleBarHeight() const
     if(res)
         return res;
 
-    if(isDesktop() || lcdPhysicalSize()<5)
-        res = 50*density()*1.2;
+    if(isDesktop())
+        res = 60*density();
+    else
+    if(isMobile())
+        res = 56*density();
     else
         res = 54*density();
 
@@ -474,12 +477,12 @@ qreal AsemanDevices::deviceDensity()
 qreal AsemanDevices::fontDensity()
 {
 #ifdef Q_OS_ANDROID
-    qreal ratio = isMobile()? FONT_RATIO*1.25 : FONT_RATIO*1.35;
+    const qreal ratio = isMobile()? FONT_RATIO*1.25 : FONT_RATIO*1.35;
     if(AsemanDevices::flag(AsemanScaleFactorEnable))
         return density()*ratio;
     else
     if(AsemanDevices::flag(DisableDensities))
-        return ratio/FONT_RATIO;
+        return ratio;
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     else
     if(QGuiApplication::testAttribute(Qt::AA_EnableHighDpiScaling))
diff --git a/qml/AsemanTools/CachedImage.qml b/qml/AsemanTools/CachedImage.qml
index 9b4610c..12ab1e2 100644
--- a/qml/AsemanTools/CachedImage.qml
+++ b/qml/AsemanTools/CachedImage.qml
@@ -30,6 +30,7 @@ Item {
         anchors.fill: parent
         source: image
         maskSource: mask
+        cached: true
     }
 
     FileDownloaderQueueItem {
diff --git a/qml/AsemanTools/Controls/Frame.qml b/qml/AsemanTools/Controls/Frame.qml
index fe020b6..423bede 100644
--- a/qml/AsemanTools/Controls/Frame.qml
+++ b/qml/AsemanTools/Controls/Frame.qml
@@ -51,6 +51,7 @@ Item {
             horizontalOffset: 0
             verticalOffset: 1
             opacity: 0.4
+            cached: true
             color: "#000000"
         }
 
diff --git a/qml/AsemanTools/MaterialDesignButton.qml b/qml/AsemanTools/MaterialDesignButton.qml
index d91ee02..d6a0488 100644
--- a/qml/AsemanTools/MaterialDesignButton.qml
+++ b/qml/AsemanTools/MaterialDesignButton.qml
@@ -212,6 +212,7 @@ Item {
             samples: 16
             color: "#aa000000"
             source: btn_rect
+            cached: true
         }
 
         MouseArea {
diff --git a/qml/AsemanTools/SlidePageManager1_1.qml b/qml/AsemanTools/SlidePageManager1_1.qml
index 7c6ea1d..d555330 100644
--- a/qml/AsemanTools/SlidePageManager1_1.qml
+++ b/qml/AsemanTools/SlidePageManager1_1.qml
@@ -27,7 +27,7 @@ Item {
     property alias mainItem: scene.itemObject
     readonly property variant currentItem: {
         if(list.count == 0)
-            return null
+            return scene.itemObject
         else
             return list.last().itemObject
     }
diff --git a/qml/AsemanTools/private/MaterialDesignButtonItem.qml b/qml/AsemanTools/private/MaterialDesignButtonItem.qml
index 3c9e19b..81cd4cc 100644
--- a/qml/AsemanTools/private/MaterialDesignButtonItem.qml
+++ b/qml/AsemanTools/private/MaterialDesignButtonItem.qml
@@ -93,6 +93,7 @@ Item {
                 radius: 8.0
                 samples: 16
                 color: "#66000000"
+                cached: true
                 source: btn_rect
             }