Skip to content

Commit cbe4c00

Browse files
committed
fix: BrowseCustomRobloxIconLocation applying changes to bootstrapper custom icon
1 parent 626f6ac commit cbe4c00

5 files changed

Lines changed: 54 additions & 6 deletions

File tree

Bloxstrap/Integrations/WindowManipulation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Bloxstrap.Integrations
99
{
1010
public class WindowManipulation
1111
{
12-
private WINEVENTPROC _setTitleHook;
12+
private WINEVENTPROC? _setTitleHook;
1313

1414
private HWND _hWnd;
1515
private uint _robloxPID;

Bloxstrap/Resources/Strings.Designer.cs

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Bloxstrap/Resources/Strings.resx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,4 +1808,16 @@ Defaulting to {1}.</value>
18081808
<data name="Menu.Integrations.MultiInstanceLaunching.Warning" xml:space="preserve">
18091809
<value>Multi-Instancing is prone to breaking. We will not provide support for issues with Multi-Instancing, since Roblox is actively adding measures to make sure it doesn't work. We cannot and won't attempt to bypass these measures.</value>
18101810
</data>
1811+
<data name="Menu.Appearance.RobloxTitle.Title" xml:space="preserve">
1812+
<value>Roblox title</value>
1813+
</data>
1814+
<data name="Menu.Appearance.RobloxTitle.Description" xml:space="preserve">
1815+
<value>Choose what title Roblox window should have.</value>
1816+
</data>
1817+
<data name="Menu.Appearance.RobloxIcon.Title" xml:space="preserve">
1818+
<value>Roblox icon</value>
1819+
</data>
1820+
<data name="Menu.Appearance.RobloxIcon.Description" xml:space="preserve">
1821+
<value>Choose what icon Roblox should display on the taskbar.</value>
1822+
</data>
18111823
</root>

Bloxstrap/UI/Elements/Settings/Pages/AppearancePage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
</controls:OptionControl>
3333
<TextBlock Text="Roblox" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
3434

35-
<controls:OptionControl Header="Set Roblox Title" Description="Set the title for the Roblox window.">
35+
<controls:OptionControl Header="{x:Static resources:Strings.Menu_Appearance_RobloxTitle_Title}" Description="{x:Static resources:Strings.Menu_Appearance_RobloxTitle_Description}">
3636
<ui:TextBox PlaceholderText="Roblox" Width="200" Text="{Binding WindowTitle, Mode=TwoWay}" />
3737
</controls:OptionControl>
3838

39-
<controls:OptionControl Header="Set Roblox Icon" Description="Set the titlebar and taskbar icon for the Roblox window.">
39+
<controls:OptionControl Header="{x:Static resources:Strings.Menu_Appearance_RobloxIcon_Title}" Description="{x:Static resources:Strings.Menu_Appearance_RobloxIcon_Description}">
4040
<ComboBox Width="200" Padding="10,5,10,5" ItemsSource="{Binding RobloxIcons, Mode=OneWay}" SelectedValuePath="IconType" SelectedValue="{Binding RobloxIcon, Mode=TwoWay}">
4141
<ComboBox.ItemTemplate>
4242
<DataTemplate>
@@ -53,7 +53,7 @@
5353
</ComboBox>
5454
</controls:OptionControl>
5555

56-
<controls:OptionControl Header="Custom Icon" Description="Set a custom icon instead of using a preset. NOTE: Icon must be a multi-size .ico file">
56+
<controls:OptionControl Header="{x:Static resources:Strings.Menu_Appearance_CustomisationIcon_Title}" Description="{x:Static resources:Strings.Menu_Appearance_CustomisationIcon_Description}">
5757
<Grid>
5858
<Grid.ColumnDefinitions>
5959
<ColumnDefinition Width="200" />

Bloxstrap/UI/ViewModels/Settings/AppearanceViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ private void BrowseCustomRobloxIconLocation()
6565
if (dialog.ShowDialog() != true)
6666
return;
6767

68-
CustomIconLocation = dialog.FileName;
69-
OnPropertyChanged(nameof(CustomIconLocation));
68+
CustomRobloxIconLocation = dialog.FileName;
69+
OnPropertyChanged(nameof(CustomRobloxIconLocation));
7070
}
7171

7272
public AppearanceViewModel(Page page)

0 commit comments

Comments
 (0)