diff --git a/Dotnet/AppApi/Common/OVRToolkit.cs b/Dotnet/AppApi/Common/OVRToolkit.cs index 2fe9f064..10cac41d 100644 --- a/Dotnet/AppApi/Common/OVRToolkit.cs +++ b/Dotnet/AppApi/Common/OVRToolkit.cs @@ -89,7 +89,7 @@ namespace VRCX /// The content of the notification. /// [CURRENTLY UNUSED]The timeout of the notification. /// The image of the notification. - public void OVRTNotification(bool hudNotification, bool wristNotification, string title, string body, int timeout, int opacity, string image = "") + public void OVRTNotification(bool hudNotification, bool wristNotification, string title, string body, int timeout, double opacity, string image = "") { List messages = []; diff --git a/Dotnet/AppApi/Common/XSOverlay.cs b/Dotnet/AppApi/Common/XSOverlay.cs index be1e0ae8..6bffe3ca 100644 --- a/Dotnet/AppApi/Common/XSOverlay.cs +++ b/Dotnet/AppApi/Common/XSOverlay.cs @@ -13,7 +13,7 @@ namespace VRCX /// The content of the notification. /// The duration of the notification in milliseconds. /// The optional image to display in the notification. - public void XSNotification(string title, string content, int timeout, int opacity, string image = "") + public void XSNotification(string title, string content, int timeout, double opacity, string image = "") { var broadcastSocket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); var endPoint = new IPEndPoint(IPAddress.Loopback, 42069); @@ -44,7 +44,7 @@ namespace VRCX audioPath = string.Empty, useBase64Icon = useBase64Icon, icon = icon, - opacity = opacity / 100f + opacity = (float)opacity }; var byteBuffer = JsonSerializer.SerializeToUtf8Bytes(msg); diff --git a/src/app.scss b/src/app.scss index d474d654..a6060ce5 100644 --- a/src/app.scss +++ b/src/app.scss @@ -87,17 +87,17 @@ padding: 5px 0; } -.el-table .cell { - display: -webkit-box; - -webkit-box-orient: vertical; - // -webkit-line-clamp: 1; -} +// .el-table .cell { +// display: -webkit-box; +// -webkit-box-orient: vertical; +// -webkit-line-clamp: 1; +// } // expand table cell on hover, TODO: replace with a better solution -.el-table__row:hover .el-table__cell .cell { - -webkit-box-orient: unset; - -webkit-line-clamp: unset; -} +// .el-table__row:hover .el-table__cell .cell { +// -webkit-box-orient: unset; +// -webkit-line-clamp: unset; +// } .el-table th.is-sortable .cell { display: flex; diff --git a/src/classes/vrcxNotifications.js b/src/classes/vrcxNotifications.js index 2c7d94f3..6de31fb3 100644 --- a/src/classes/vrcxNotifications.js +++ b/src/classes/vrcxNotifications.js @@ -570,9 +570,10 @@ export default class extends baseClass { }, displayXSNotification(noty, message, image) { - var timeout = Math.floor( + const timeout = Math.floor( parseInt(this.notificationTimeout, 10) / 1000 ); + const opacity = parseFloat(this.notificationOpacity) / 100; switch (noty.type) { case 'OnPlayerJoined': AppApi.XSNotification( @@ -968,9 +969,10 @@ export default class extends baseClass { message, image ) { - var timeout = Math.floor( + const timeout = Math.floor( parseInt(this.notificationTimeout, 10) / 1000 ); + const opacity = parseFloat(this.notificationOpacity) / 100; switch (noty.type) { case 'OnPlayerJoined': AppApi.OVRTNotification( diff --git a/src/mixins/tabs/settings.pug b/src/mixins/tabs/settings.pug index 4b343107..b57686d8 100644 --- a/src/mixins/tabs/settings.pug +++ b/src/mixins/tabs/settings.pug @@ -788,9 +788,9 @@ mixin settingsTab el-tab-pane(lazy :label='$t("view.settings.category.pictures")') .options-container(style='margin-top: 0') span.header {{ $t('view.settings.category.pictures') }} - - .options-container - el-button(size='small' icon='el-icon-picture' @click='showScreenshotMetadataDialog()') {{ $t('view.settings.advanced.advanced.screenshot_metadata') }} + .options-container-item(style='margin-top: 15px') + el-button-group + el-button(size='small' icon='el-icon-picture' @click='showScreenshotMetadataDialog()') {{ $t('view.settings.advanced.advanced.screenshot_metadata') }} .options-container span.header {{ $t('view.settings.pictures.pictures.open_folder') }}