Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add really basic scale factor #235

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions XIVComboPlugin/XIVCombo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>
<PropertyGroup Label="Feature">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>1.7.13</Version>
<Version>1.7.14</Version>
</PropertyGroup>
<PropertyGroup>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
Expand Down Expand Up @@ -50,10 +50,10 @@
<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
</Reference>
<Reference Include="SDL2-CS">
<HintPath>..\..\..\..\AppData\Roaming\XIVLauncher\addon\Hooks\dev\SDL2-CS.dll</HintPath>
<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\SDL2-CS.dll</HintPath>
</Reference>
<Reference Include="Serilog">
<HintPath>..\..\..\..\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Serilog.dll</HintPath>
<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\Serilog.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions XIVComboPlugin/XIVComboPlugin.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Dalamud.Game.Command;
using Dalamud.Game.Command;
using Dalamud.Plugin;
using System;
using System.Linq;
Expand Down Expand Up @@ -123,16 +123,16 @@ private void UiBuilder_OnBuildUi()
flagsSelected[i] = Configuration.ComboPresets.HasFlag(orderedByClassJob[i]);
}

ImGui.SetNextWindowSize(new Vector2(740, 490));
ImGui.SetNextWindowSize(new Vector2(740 * ImGui.GetIO().FontGlobalScale, 490 * ImGui.GetIO().FontGlobalScale));

ImGui.Begin("Custom Combo Setup", ref isImguiComboSetupOpen, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoScrollbar);

ImGui.Text("This window allows you to enable and disable custom combos to your liking.");
ImGui.Separator();

ImGui.BeginChild("scrolling", new Vector2(0, 400), true, ImGuiWindowFlags.HorizontalScrollbar);
ImGui.BeginChild("scrolling", new Vector2(0, 400 * ImGui.GetIO().FontGlobalScale), true, ImGuiWindowFlags.HorizontalScrollbar);

ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0, 5));
ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0, 5 * ImGui.GetIO().FontGlobalScale));

var lastClassJob = 0;

Expand Down