Skip to content

Commit 66b959c

Browse files
committed
added yes no dialog to window (does not work with owner != null?)
1 parent 6811e52 commit 66b959c

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

TextureViewer/App.xaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@ public static void ShowInfoDialog(Window owner, string message)
129129
MessageBox.Show(message, "Info", MessageBoxButton.OK, MessageBoxImage.Information);
130130
}
131131

132+
public static bool ShowYesNoDialog(Window owner, string title, string message)
133+
{
134+
if (owner != null)
135+
return MessageBox.Show(owner, message, title, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes, MessageBoxOptions.DefaultDesktopOnly) == MessageBoxResult.Yes;
136+
return MessageBox.Show(message, title, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes, MessageBoxOptions.DefaultDesktopOnly) == MessageBoxResult.Yes;
137+
}
138+
132139
private static readonly CultureInfo CultureInfo = new CultureInfo("en-US");
133140

134141
public static CultureInfo GetCulture()

TextureViewer/Models/ImagesModel.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ private struct Dimension
2222
}
2323

2424
private OpenGlContext context;
25+
private AppModel app;
2526
private Dimension[] dimensions = null;
2627

2728
private class ImageData
@@ -73,8 +74,9 @@ public void Dispose()
7374

7475
private readonly List<ImageData> images;
7576

76-
public ImagesModel(OpenGlContext context)
77+
public ImagesModel(OpenGlContext context, AppModel app)
7778
{
79+
this.app = app;
7880
this.context = context;
7981
images = new List<ImageData>();
8082
}
@@ -212,8 +214,7 @@ public void AddImages(List<ImageLoader.Image> imgs)
212214
}
213215
else if(image.NumMipmaps == 1)
214216
{
215-
// TODO inform the user?
216-
// generate mipmaps for the new image
217+
// generate mipmaps for the new image (silent)
217218
imgData = new ImageData(image);
218219
imgData.GenerateMipmaps(NumMipmaps);
219220
}

TextureViewer/Models/Models.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public Models(App app, MainWindow window, WindowViewModel viewModel)
2525
GlContext = new OpenGlContext(window, viewModel);
2626
GlContext.Enable();
2727

28-
Images = new ImagesModel(GlContext);
28+
Images = new ImagesModel(GlContext, App);
2929
GlData = new OpenGlModel(GlContext, Images);
3030
Display = new DisplayModel(Images, GlContext);
3131
Equations = new ImageEquationsModel(Images);

0 commit comments

Comments
 (0)