Use flex instead of forceFit

17 files changed, 38 insertions, 41 deletions

diff --git a/web/app/view/AttributeAliases.js b/web/app/view/AttributeAliases.js
index 6408ad3a..7ceaff33 100644
--- a/web/app/view/AttributeAliases.js
+++ b/web/app/view/AttributeAliases.js
@@ -51,10 +51,9 @@ Ext.define('Traccar.view.AttributeAliases', {
         selectionchange: 'onSelectionChange'
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/Attributes.js b/web/app/view/Attributes.js
index aa2db368..37d28c15 100644
--- a/web/app/view/Attributes.js
+++ b/web/app/view/Attributes.js
@@ -36,10 +36,9 @@ Ext.define('Traccar.view.Attributes', {
         selectionchange: 'onSelectionChange'
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/Calendars.js b/web/app/view/Calendars.js
index a905a5ba..35d0beb8 100644
--- a/web/app/view/Calendars.js
+++ b/web/app/view/Calendars.js
@@ -38,10 +38,9 @@ Ext.define('Traccar.view.Calendars', {
         selectionchange: 'onSelectionChange'
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/DeviceGeofences.js b/web/app/view/DeviceGeofences.js
index 986ca3a4..96a7abf7 100644
--- a/web/app/view/DeviceGeofences.js
+++ b/web/app/view/DeviceGeofences.js
@@ -36,12 +36,13 @@ Ext.define('Traccar.view.DeviceGeofences', {
         beforeselect: 'onBeforeSelect'
     },
 
-    forceFit: true,
-
     columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
         items: [{
             text: Strings.sharedName,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'name'
         }]
     }
diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 6ca40987..664c094f 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -145,10 +145,9 @@ Ext.define('Traccar.view.Devices', {
         selectionchange: 'onSelectionChange'
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/Geofences.js b/web/app/view/Geofences.js
index 3df21609..968dbeef 100644
--- a/web/app/view/Geofences.js
+++ b/web/app/view/Geofences.js
@@ -37,10 +37,9 @@ Ext.define('Traccar.view.Geofences', {
         selectionchange: 'onSelectionChange'
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/GroupGeofences.js b/web/app/view/GroupGeofences.js
index 12c785fa..bf66c621 100644
--- a/web/app/view/GroupGeofences.js
+++ b/web/app/view/GroupGeofences.js
@@ -36,12 +36,13 @@ Ext.define('Traccar.view.GroupGeofences', {
         beforeselect: 'onBeforeSelect'
     },
 
-    forceFit: true,
-
     columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
         items: [{
             text: Strings.sharedName,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'name'
         }]
     }
diff --git a/web/app/view/Groups.js b/web/app/view/Groups.js
index 0c166f1f..a75ed8d7 100644
--- a/web/app/view/Groups.js
+++ b/web/app/view/Groups.js
@@ -46,10 +46,9 @@ Ext.define('Traccar.view.Groups', {
         selectionchange: 'onSelectionChange'
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/Notifications.js b/web/app/view/Notifications.js
index 419d9616..8f6ca484 100644
--- a/web/app/view/Notifications.js
+++ b/web/app/view/Notifications.js
@@ -34,10 +34,9 @@ Ext.define('Traccar.view.Notifications', {
         markDirty: false
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 61699bf7..1289e6b2 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -75,9 +75,9 @@ Ext.define('Traccar.view.Report', {
         listeners: {
             selectionchange: 'onSelectionChange'
         },
-        forceFit: true,
         columns: {
             defaults: {
+                flex: 1,
                 minWidth: Traccar.Style.columnWidthNormal
             },
             items: [
diff --git a/web/app/view/Statistics.js b/web/app/view/Statistics.js
index 7232951a..4322525b 100644
--- a/web/app/view/Statistics.js
+++ b/web/app/view/Statistics.js
@@ -48,10 +48,9 @@ Ext.define('Traccar.view.Statistics', {
         handler: 'onShowClick'
     }],
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{
diff --git a/web/app/view/UserCalendars.js b/web/app/view/UserCalendars.js
index 29bb99cb..119e5805 100644
--- a/web/app/view/UserCalendars.js
+++ b/web/app/view/UserCalendars.js
@@ -37,12 +37,13 @@ Ext.define('Traccar.view.UserCalendars', {
         beforeselect: 'onBeforeSelect'
     },
 
-    forceFit: true,
-
     columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
         items: [{
             text: Strings.sharedName,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'name'
         }]
     }
diff --git a/web/app/view/UserDevices.js b/web/app/view/UserDevices.js
index 1f68a29a..92f569e7 100644
--- a/web/app/view/UserDevices.js
+++ b/web/app/view/UserDevices.js
@@ -36,16 +36,16 @@ Ext.define('Traccar.view.UserDevices', {
         beforeselect: 'onBeforeSelect'
     },
 
-    forceFit: true,
-
     columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
         items: [{
             text: Strings.sharedName,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'name'
         }, {
             text: Strings.deviceIdentifier,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'uniqueId'
         }]
     }
diff --git a/web/app/view/UserGeofences.js b/web/app/view/UserGeofences.js
index c960accb..c595ec72 100644
--- a/web/app/view/UserGeofences.js
+++ b/web/app/view/UserGeofences.js
@@ -36,12 +36,13 @@ Ext.define('Traccar.view.UserGeofences', {
         beforeselect: 'onBeforeSelect'
     },
 
-    forceFit: true,
-
     columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
         items: [{
             text: Strings.sharedName,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'name'
         }]
     }
diff --git a/web/app/view/UserGroups.js b/web/app/view/UserGroups.js
index 6b53dd93..aca98530 100644
--- a/web/app/view/UserGroups.js
+++ b/web/app/view/UserGroups.js
@@ -36,12 +36,13 @@ Ext.define('Traccar.view.UserGroups', {
         beforeselect: 'onBeforeSelect'
     },
 
-    forceFit: true,
-
     columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
         items: [{
             text: Strings.sharedName,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'name'
         }]
     }
diff --git a/web/app/view/UserUsers.js b/web/app/view/UserUsers.js
index 265acc87..733c137f 100644
--- a/web/app/view/UserUsers.js
+++ b/web/app/view/UserUsers.js
@@ -37,12 +37,13 @@ Ext.define('Traccar.view.UserUsers', {
         beforeselect: 'onBeforeSelect'
     },
 
-    forceFit: true,
-
     columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
         items: [{
             text: Strings.sharedName,
-            minWidth: Traccar.Style.columnWidthNormal,
             dataIndex: 'name'
         }]
     }
diff --git a/web/app/view/Users.js b/web/app/view/Users.js
index 2c0bbefa..bdff8d73 100644
--- a/web/app/view/Users.js
+++ b/web/app/view/Users.js
@@ -81,10 +81,9 @@ Ext.define('Traccar.view.Users', {
         selectionchange: 'onSelectionChange'
     },
 
-    forceFit: true,
-
     columns: {
         defaults: {
+            flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
         },
         items: [{