Skip to content

Commit

Permalink
fix: 修复编译
Browse files Browse the repository at this point in the history
  • Loading branch information
Blinue committed Jul 18, 2023
1 parent 383901c commit 55e1f4a
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 20 deletions.
79 changes: 60 additions & 19 deletions src/Magpie.App/Resources.language-it.resw
Original file line number Diff line number Diff line change
@@ -1,6 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
Expand Down Expand Up @@ -163,12 +222,6 @@
<data name="Settings_Launch.Title" xml:space="preserve">
<value>Avvia</value>
</data>
<data name="ScalingConfiguration_General.Title" xml:space="preserve">
<value>Generali</value>
</data>
<data name="ScalingConfiguration_General_DefaultDownscalingEffect.Description" xml:space="preserve">
<value>Applicato automaticamente quando l'immagine di output è troppo grande per entrare nello schermo</value>
</data>
<data name="ScalingConfiguration_General_Export.Text" xml:space="preserve">
<value>Esporta</value>
</data>
Expand Down Expand Up @@ -211,12 +264,6 @@
<data name="About_OtherLinks_ContributionGuidelines.Text" xml:space="preserve">
<value>Linee guida per contribuire</value>
</data>
<data name="ScalingConfiguration_General_DefaultDownscalingEffect.Title" xml:space="preserve">
<value>Effetto di ridimensionamento predefinito</value>
</data>
<data name="ScalingConfiguration_General_DefaultDownscalingEffect_None" xml:space="preserve">
<value>Nessuno</value>
</data>
<data name="ScalingConfiguration_ScalingModes_MoreOptionsFlyout_Delete.Text" xml:space="preserve">
<value>Cancella</value>
</data>
Expand Down Expand Up @@ -331,12 +378,6 @@
<data name="Profile_MoreOptions_Delete.Text" xml:space="preserve">
<value>Cancella</value>
</data>
<data name="Profile_Performance_VSync_TripleBuffering.Content" xml:space="preserve">
<value>Consenti ulteriore latenza per migliorare le prestazioni</value>
</data>
<data name="Profile_Performance_VSync.Title" xml:space="preserve">
<value>VSync</value>
</data>
<data name="About_Feedback.Title" xml:space="preserve">
<value>Feedback</value>
</data>
Expand Down
2 changes: 1 addition & 1 deletion src/Magpie.Core/ImGuiImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ void ImGuiImpl::ClearStates() {
}*/
}

void ImGuiImpl::MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) noexcept {
void ImGuiImpl::MessageHandler(UINT msg, WPARAM wParam, LPARAM /*lParam*/) noexcept {
ImGuiIO& io = ImGui::GetIO();

/*if (!io.WantCaptureMouse) {
Expand Down

0 comments on commit 55e1f4a

Please sign in to comment.