Merge pull request #18 from mitchcapper/scaling_improvements

scale note commits
mitchcapper · Jun 13, 2017 · 1b65bc4 · 1b65bc4
2 parents 70b701d + 4defc9b
commit 1b65bc4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/EntryTemplateManager.ChildViewer.cs b/EntryTemplateManager.ChildViewer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
@@ -161,6 +161,14 @@ public static Dictionary<String, String> get_template_title_to_field_dict(IPlugi
 			}
 			return ret;
 		}
+
+		//private int ScaleX(int i) {
+		//	return DpiUtil.ScaleIntX(i);
+		//}
+		//private int ScaleY(int i) {
+		//	return DpiUtil.ScaleIntY(i);
+		//}
+
 		private bool InitializeChildView(TabPage page, String uuid) {
 			if (et_to_label != null) {
 				add_child_items_to_tab(page);
@@ -188,11 +196,13 @@ private bool InitializeChildView(TabPage page, String uuid) {
 			int CONTROL_WIDTH = TAB_WIDTH - LABEL_WIDTH - 55;
 			foreach (EntryTemplate t in cur) {
 				Label label = new Label();
+				label.Text = t.title + ":";
+				//label.AutoSize = false;
 				label.Top = control_offset_y;
 				label.Left = 0;
-				label.Text = t.title + ":";
 				label.AutoSize = false;
 				label.Width = LABEL_WIDTH;
+
 				label.AutoEllipsis = true;
 				label.TextAlign = ContentAlignment.MiddleRight;
 				FontUtil.AssignDefaultBold(label);

diff --git a/KPEntryTemplates.csproj b/KPEntryTemplates.csproj
@@ -35,6 +35,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -43,9 +44,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="KeePass">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\save\keepass_bin\KeePass.exe</HintPath>
       <Private>False</Private>
     </Reference>
@@ -105,11 +108,11 @@
     <None Include="Resources\B16x16_KGPG_Info.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>