|
2 | 2 | using System.Drawing; |
3 | 3 | using System.Drawing.Imaging; |
4 | 4 | using System.IO; |
| 5 | +using System.Linq; |
5 | 6 | using System.Runtime.InteropServices; |
6 | 7 | using System.Windows.Forms; |
7 | 8 | using Rainmeter; |
@@ -34,6 +35,7 @@ internal class Measure |
34 | 35 | private string finishAction = ""; // Action to execute after screenshot is taken |
35 | 36 | private Rainmeter.API api; // Rainmeter API reference |
36 | 37 | public static bool showCursor; // Include cursor in the screenshot |
| 38 | + public static int jpegQuality; // JPEG quality for saving images |
37 | 39 |
|
38 | 40 | // Predefined coordinates for -ps command. |
39 | 41 | private int predefX; |
@@ -77,7 +79,7 @@ public void Reload(Rainmeter.API api, ref double maxValue) |
77 | 79 | savePath = api.ReadString("SavePath", ""); |
78 | 80 | finishAction = api.ReadString("ScreenshotFinishAction", ""); |
79 | 81 | showCursor = api.ReadInt("ShowCursor", 0) > 0; |
80 | | - |
| 82 | + jpegQuality = api.ReadInt("JpgQuality", 70); |
81 | 83 | predefX = api.ReadInt("PredefX", 0); |
82 | 84 | predefY = api.ReadInt("PredefY", 0); |
83 | 85 | predefWidth = api.ReadInt("PredefWidth", 0); |
@@ -204,13 +206,42 @@ private void SaveImage(Bitmap bitmap) |
204 | 206 | { |
205 | 207 | try |
206 | 208 | { |
207 | | - bitmap.Save(savePath, ImageFormat.Png); |
208 | | - Logger.Log("Image saved to: " + savePath); |
| 209 | + ImageFormat format = GetImageFormat(savePath); |
| 210 | + |
| 211 | + if (format.Equals(ImageFormat.Jpeg)) |
| 212 | + { |
| 213 | + var encoder = ImageCodecInfo.GetImageEncoders().FirstOrDefault(c => c.FormatID == ImageFormat.Jpeg.Guid); |
| 214 | + var encoderParams = new EncoderParameters(1); |
| 215 | + encoderParams.Param[0] = new EncoderParameter(Encoder.Quality, Measure.jpegQuality); |
| 216 | + bitmap.Save(savePath, encoder, encoderParams); |
| 217 | + } |
| 218 | + else |
| 219 | + { |
| 220 | + bitmap.Save(savePath, format); |
| 221 | + } |
209 | 222 | } |
210 | 223 | catch (Exception ex) |
211 | 224 | { |
212 | | - api.Log(API.LogType.Error, "Error saving image: " + ex.Message); |
213 | | - Logger.Log("Error saving image: " + ex.Message); |
| 225 | + Logger.Log("Error saving custom screenshot: " + ex.Message); |
| 226 | + } |
| 227 | + } |
| 228 | + |
| 229 | + private ImageFormat GetImageFormat(string path) |
| 230 | + { |
| 231 | + string ext = Path.GetExtension(path).ToLowerInvariant(); |
| 232 | + switch (ext) |
| 233 | + { |
| 234 | + case ".jpg": |
| 235 | + case ".jpeg": |
| 236 | + return ImageFormat.Jpeg; |
| 237 | + case ".png": |
| 238 | + return ImageFormat.Png; |
| 239 | + case ".bmp": |
| 240 | + return ImageFormat.Bmp; |
| 241 | + case ".tiff": |
| 242 | + return ImageFormat.Tiff; |
| 243 | + default: |
| 244 | + return ImageFormat.Png; // fallback |
214 | 245 | } |
215 | 246 | } |
216 | 247 |
|
@@ -412,15 +443,24 @@ private void SaveImage(Bitmap bitmap) |
412 | 443 | try |
413 | 444 | { |
414 | 445 | ImageFormat format = GetImageFormat(savePath); |
415 | | - bitmap.Save(savePath, format); |
416 | | - Logger.Log("Custom screenshot saved to: " + savePath); |
| 446 | + |
| 447 | + if (format.Equals(ImageFormat.Jpeg)) |
| 448 | + { |
| 449 | + var encoder = ImageCodecInfo.GetImageEncoders().FirstOrDefault(c => c.FormatID == ImageFormat.Jpeg.Guid); |
| 450 | + var encoderParams = new EncoderParameters(1); |
| 451 | + encoderParams.Param[0] = new EncoderParameter(Encoder.Quality, Measure.jpegQuality); |
| 452 | + bitmap.Save(savePath, encoder, encoderParams); |
| 453 | + } |
| 454 | + else |
| 455 | + { |
| 456 | + bitmap.Save(savePath, format); |
| 457 | + } |
417 | 458 | } |
418 | 459 | catch (Exception ex) |
419 | 460 | { |
420 | 461 | Logger.Log("Error saving custom screenshot: " + ex.Message); |
421 | 462 | } |
422 | 463 | } |
423 | | - |
424 | 464 | private ImageFormat GetImageFormat(string path) |
425 | 465 | { |
426 | 466 | string ext = Path.GetExtension(path).ToLowerInvariant(); |
|
0 commit comments