Skip to content

Commit

Permalink
fix trigger page changed when changing page and imagetask updates con…
Browse files Browse the repository at this point in the history
…trols
  • Loading branch information
t0815 committed Aug 21, 2024
1 parent 51a0f91 commit 9c8dfd5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion MyCBZ/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<applicationSettings>
<Win_CBZ.Win_CBZSettings>
<setting name="Version" serializeAs="String">
<value>0.19.144b</value>
<value>0.19.145b</value>
</setting>
<setting name="RenamerPlaceholders" serializeAs="Xml">
<value>
Expand Down
5 changes: 3 additions & 2 deletions MyCBZ/Forms/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5505,6 +5505,7 @@ private void TextBoxResizeW_TextChanged(object sender, EventArgs e)

if (selectedImageTasks != null)
{
Page selectedPage = PagesList.SelectedItem?.Tag as Page;
Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);

oldValue = page?.ImageTask.ImageAdjustments.ResizeTo.X;
Expand All @@ -5524,7 +5525,7 @@ private void TextBoxResizeW_TextChanged(object sender, EventArgs e)

selectedImageTasks.ImageAdjustments.ResizeTo = new Point(w, selectedImageTasks.ImageAdjustments.ResizeTo.Y);

if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ConvertType)
if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ResizeTo.X)
{
AppEventHandler.OnPageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED, true));
AppEventHandler.OnArchiveStatusChanged(this, new CBZArchiveStatusEvent(Program.ProjectModel, CBZArchiveStatusEvent.ARCHIVE_FILE_UPDATED));
Expand Down Expand Up @@ -5557,7 +5558,7 @@ private void TextBoxResizeH_TextChanged(object sender, EventArgs e)

selectedImageTasks.ImageAdjustments.ResizeTo = new Point(selectedImageTasks.ImageAdjustments.ResizeTo.X, h);

if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ConvertType)
if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ResizeTo.Y)
{
AppEventHandler.OnPageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED, true));
AppEventHandler.OnArchiveStatusChanged(this, new CBZArchiveStatusEvent(Program.ProjectModel, CBZArchiveStatusEvent.ARCHIVE_FILE_UPDATED));
Expand Down
2 changes: 1 addition & 1 deletion MyCBZ/Win_CBZ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>0.19.144.%2a</ApplicationVersion>
<ApplicationVersion>0.19.145.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand Down
2 changes: 1 addition & 1 deletion MyCBZ/Win_CBZSettings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion MyCBZ/Win_CBZSettings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Value Profile="(Default)">%APPDATA%\WIN_CBZ\Temp\</Value>
</Setting>
<Setting Name="Version" Type="System.String" Scope="Application">
<Value Profile="(Default)">0.19.144b</Value>
<Value Profile="(Default)">0.19.145b</Value>
</Setting>
<Setting Name="RenamerPlaceholders" Type="System.Collections.Specialized.StringCollection" Scope="Application">
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit)

## Latest Release

v0.19.144b released!
v0.19.145b released!

## Third party components

Expand Down
6 changes: 3 additions & 3 deletions Win_CBZ-Setup/Win_CBZ-Setup.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Win_CBZ"
"ProductCode" = "8:{3E63B11B-A4EE-480C-86E9-236DF3D62037}"
"PackageCode" = "8:{73359F68-9711-45C8-8D42-5197E9AB743E}"
"ProductCode" = "8:{9D11D719-8537-4341-8BE4-9ABCA4E58D29}"
"PackageCode" = "8:{BD1EC95C-4E8C-453D-93A0-507CD62E1086}"
"UpgradeCode" = "8:{66FAEF81-1CAE-4971-9E0F-796310EFEA5E}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:0.19.144"
"ProductVersion" = "8:0.19.145"
"Manufacturer" = "8:Trash_s0Ft"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down

0 comments on commit 9c8dfd5

Please sign in to comment.