Skip to content

Commit 9019bc7

Browse files
johnml1135johnml1135
committed
LT-22324: address Jason review comments
1 parent 111b9e2 commit 9019bc7

3 files changed

Lines changed: 27 additions & 20 deletions

File tree

‎Src/Common/SimpleRootSite/RenderEngineFactory.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public RenderEngineFactory()
3636
/// Font name may be '<default font>' which produces a renderer suitable for the default
3737
/// font.
3838
/// </summary>
39-
public IRenderEngine get_Renderer(ILgWritingSystem ws, IVwGraphics vg)
39+
public IRenderEngine GetRenderer(ILgWritingSystem ws, IVwGraphics vg)
4040
{
4141
LgCharRenderProps chrp = vg.FontCharProperties;
4242
string fontName = MarshalEx.UShortToString(chrp.szFaceName);
@@ -86,6 +86,11 @@ public IRenderEngine get_Renderer(ILgWritingSystem ws, IVwGraphics vg)
8686
return wsFontEngines[key].Item2;
8787
}
8888

89+
IRenderEngine IRenderEngineFactory.get_Renderer(ILgWritingSystem ws, IVwGraphics vg)
90+
{
91+
return GetRenderer(ws, vg);
92+
}
93+
8994
private static string GetFontFeatures(LgCharRenderProps chrp, ILgWritingSystem ws, bool usesDefaultFont)
9095
{
9196
string charRenderFeatures = chrp.szFontVar == null

‎Src/Common/SimpleRootSite/SimpleRootSiteTests/RenderEngineFactoryTests.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ namespace SIL.FieldWorks.Common.RootSites.SimpleRootSiteTests
2020
public class RenderEngineFactoryTests
2121
{
2222
/// <summary>
23-
/// Tests the get_RendererFromChrp method with a normal font.
23+
/// Tests the GetRenderer method with a normal font.
2424
/// </summary>
2525
[Test]
26-
public void get_Renderer_Uniscribe()
26+
public void GetRenderer_Uniscribe()
2727
{
2828
using (var control = new Form())
2929
using (var gm = new GraphicsManager(control))
@@ -41,7 +41,7 @@ public void get_Renderer_Uniscribe()
4141
};
4242
MarshalEx.StringToUShort("Arial", chrp.szFaceName);
4343
gm.VwGraphics.SetupGraphics(ref chrp);
44-
IRenderEngine engine = reFactory.get_Renderer(ws, gm.VwGraphics);
44+
IRenderEngine engine = reFactory.GetRenderer(ws, gm.VwGraphics);
4545
Assert.That(engine, Is.Not.Null);
4646
Assert.That(engine.WritingSystemFactory, Is.SameAs(wsManager));
4747
Assert.That(engine, Is.InstanceOf(typeof(UniscribeEngine)));
@@ -55,10 +55,10 @@ public void get_Renderer_Uniscribe()
5555
}
5656

5757
/// <summary>
58-
/// Tests the get_RendererFromChrp method with a Graphite font.
58+
/// Tests the GetRenderer method with a Graphite font.
5959
/// </summary>
6060
[Test]
61-
public void get_Renderer_Graphite()
61+
public void GetRenderer_Graphite()
6262
{
6363
using (var control = new Form())
6464
using (var gm = new GraphicsManager(control))
@@ -77,14 +77,14 @@ public void get_Renderer_Graphite()
7777
};
7878
MarshalEx.StringToUShort("Charis SIL", chrp.szFaceName);
7979
gm.VwGraphics.SetupGraphics(ref chrp);
80-
IRenderEngine engine = reFactory.get_Renderer(ws, gm.VwGraphics);
80+
IRenderEngine engine = reFactory.GetRenderer(ws, gm.VwGraphics);
8181
Assert.That(engine, Is.Not.Null);
8282
Assert.That(engine.WritingSystemFactory, Is.SameAs(wsManager));
8383
Assert.That(engine, Is.InstanceOf(typeof(UniscribeEngine)));
8484

8585
ws.IsGraphiteEnabled = true;
8686
gm.VwGraphics.SetupGraphics(ref chrp);
87-
engine = reFactory.get_Renderer(ws, gm.VwGraphics);
87+
engine = reFactory.GetRenderer(ws, gm.VwGraphics);
8888
Assert.That(engine, Is.Not.Null);
8989
Assert.That(engine.WritingSystemFactory, Is.SameAs(wsManager));
9090
Assert.That(engine, Is.InstanceOf(typeof(GraphiteEngine)));
@@ -98,7 +98,7 @@ public void get_Renderer_Graphite()
9898
}
9999

100100
[Test]
101-
public void get_Renderer_DefaultFontFeatures_CopiesNormalizedFeaturesToGraphics()
101+
public void GetRenderer_DefaultFontFeatures_CopiesNormalizedFeaturesToGraphics()
102102
{
103103
using (var control = new Form())
104104
using (var gm = new GraphicsManager(control))
@@ -114,7 +114,7 @@ public void get_Renderer_DefaultFontFeatures_CopiesNormalizedFeaturesToGraphics(
114114
var chrp = CreateCharRenderProps(ws.Handle, "<default font>", string.Empty);
115115
gm.VwGraphics.SetupGraphics(ref chrp);
116116

117-
IRenderEngine engine = reFactory.get_Renderer(ws, gm.VwGraphics);
117+
IRenderEngine engine = reFactory.GetRenderer(ws, gm.VwGraphics);
118118
var graphicsChrp = gm.VwGraphics.FontCharProperties;
119119

120120
Assert.That(engine, Is.InstanceOf(typeof(UniscribeEngine)));
@@ -134,7 +134,7 @@ public void get_Renderer_DefaultFontFeatures_CopiesNormalizedFeaturesToGraphics(
134134
}
135135

136136
[Test]
137-
public void get_Renderer_DefaultFontWithStyleFeatures_PreservesStyleFeatures()
137+
public void GetRenderer_DefaultFontWithStyleFeatures_PreservesStyleFeatures()
138138
{
139139
using (var control = new Form())
140140
using (var gm = new GraphicsManager(control))
@@ -150,7 +150,7 @@ public void get_Renderer_DefaultFontWithStyleFeatures_PreservesStyleFeatures()
150150
var chrp = CreateCharRenderProps(ws.Handle, "<default font>", " smcp = 1, kern=0 ");
151151
gm.VwGraphics.SetupGraphics(ref chrp);
152152

153-
IRenderEngine engine = reFactory.get_Renderer(ws, gm.VwGraphics);
153+
IRenderEngine engine = reFactory.GetRenderer(ws, gm.VwGraphics);
154154
var graphicsChrp = gm.VwGraphics.FontCharProperties;
155155

156156
Assert.That(engine, Is.InstanceOf(typeof(UniscribeEngine)));
@@ -170,7 +170,7 @@ public void get_Renderer_DefaultFontWithStyleFeatures_PreservesStyleFeatures()
170170
}
171171

172172
[Test]
173-
public void get_Renderer_OpenTypeFeatures_ArePartOfCacheIdentity()
173+
public void GetRenderer_OpenTypeFeatures_ArePartOfCacheIdentity()
174174
{
175175
using (var control = new Form())
176176
using (var gm = new GraphicsManager(control))
@@ -187,21 +187,21 @@ public void get_Renderer_OpenTypeFeatures_ArePartOfCacheIdentity()
187187
"Arial",
188188
" smcp = 1, kern=0 ");
189189
gm.VwGraphics.SetupGraphics(ref firstChrp);
190-
IRenderEngine first = reFactory.get_Renderer(ws, gm.VwGraphics);
190+
IRenderEngine first = reFactory.GetRenderer(ws, gm.VwGraphics);
191191

192192
var equivalentChrp = CreateCharRenderProps(
193193
ws.Handle,
194194
"Arial",
195195
"kern=0,smcp=1");
196196
gm.VwGraphics.SetupGraphics(ref equivalentChrp);
197-
IRenderEngine equivalent = reFactory.get_Renderer(ws, gm.VwGraphics);
197+
IRenderEngine equivalent = reFactory.GetRenderer(ws, gm.VwGraphics);
198198

199199
var differentChrp = CreateCharRenderProps(
200200
ws.Handle,
201201
"Arial",
202202
"smcp=0,kern=0");
203203
gm.VwGraphics.SetupGraphics(ref differentChrp);
204-
IRenderEngine different = reFactory.get_Renderer(ws, gm.VwGraphics);
204+
IRenderEngine different = reFactory.GetRenderer(ws, gm.VwGraphics);
205205

206206
Assert.That(equivalent, Is.SameAs(first));
207207
Assert.That(different, Is.Not.SameAs(first));
@@ -218,7 +218,7 @@ public void get_Renderer_OpenTypeFeatures_ArePartOfCacheIdentity()
218218
}
219219

220220
[Test]
221-
public void get_Renderer_ExplicitFontNameMatchingDefault_DoesNotApplyDefaultFontFeatures()
221+
public void GetRenderer_ExplicitFontNameMatchingDefault_DoesNotApplyDefaultFontFeatures()
222222
{
223223
using (var control = new Form())
224224
using (var gm = new GraphicsManager(control))
@@ -234,7 +234,7 @@ public void get_Renderer_ExplicitFontNameMatchingDefault_DoesNotApplyDefaultFont
234234
var chrp = CreateCharRenderProps(ws.Handle, "Arial", string.Empty);
235235
gm.VwGraphics.SetupGraphics(ref chrp);
236236

237-
reFactory.get_Renderer(ws, gm.VwGraphics);
237+
reFactory.GetRenderer(ws, gm.VwGraphics);
238238
Assert.That(MarshalEx.UShortToString(gm.VwGraphics.FontCharProperties.szFontVar), Is.EqualTo(string.Empty));
239239
wsManager.Save();
240240
}
@@ -246,7 +246,7 @@ public void get_Renderer_ExplicitFontNameMatchingDefault_DoesNotApplyDefaultFont
246246
}
247247

248248
[Test]
249-
public void get_Renderer_DefaultNumericGraphiteFeatures_ArePreserved()
249+
public void GetRenderer_DefaultNumericGraphiteFeatures_ArePreserved()
250250
{
251251
using (var control = new Form())
252252
using (var gm = new GraphicsManager(control))
@@ -262,7 +262,7 @@ public void get_Renderer_DefaultNumericGraphiteFeatures_ArePreserved()
262262
var chrp = CreateCharRenderProps(ws.Handle, "<default font>", string.Empty);
263263
gm.VwGraphics.SetupGraphics(ref chrp);
264264

265-
reFactory.get_Renderer(ws, gm.VwGraphics);
265+
reFactory.GetRenderer(ws, gm.VwGraphics);
266266
Assert.That(MarshalEx.UShortToString(gm.VwGraphics.FontCharProperties.szFontVar), Is.EqualTo("123=1,456=2"));
267267
wsManager.Save();
268268
}

‎Src/xWorks/xWorksTests/XhtmlDocViewTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public void XhtmlDocView_ImplementsRefreshableRoot()
4444
{
4545
using (var docView = new TestXhtmlDocView())
4646
{
47+
// FwXWindow refreshes a view subtree through the first IRefreshableRoot it finds;
48+
// this keeps XHTML dictionary views from being skipped during reconstruct/refresh.
4749
Assert.That(docView, Is.InstanceOf<IRefreshableRoot>());
4850
}
4951
}

0 commit comments

Comments
 (0)