feat: taskbar title shows file name, icon sizes 16-256, settings order, fixed 4-col size grid (v1.9.0)
This commit is contained in:
Alhan committed
1 parent
eed0646237
commit
a5969cf28f
13 files changed
+135
-98
No files matched your search
@@ -1,6 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
import 'package:window_manager/window_manager.dart';
|
||||
import 'package:desktop_drop/desktop_drop.dart';
|
||||
import 'package:pdf/pdf.dart';
|
||||
@@ -18,7 +19,7 @@ import '../shortcuts/app_shortcuts.dart';
|
||||
import '../services/window_persistence.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
|
||||
const appVersion = '1.8.0';
|
||||
const appVersion = '1.9.0';
|
||||
|
||||
class ViewerScreen extends StatefulWidget {
|
||||
final List<String> initialFiles;
|
||||
@@ -45,7 +46,10 @@ class _ViewerScreenState extends State<ViewerScreen> with WindowListener {
|
||||
if (widget.initialFiles.isNotEmpty) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
FileHandler.loadImagesFromPaths(widget.initialFiles);
|
||||
_updateTitle();
|
||||
});
|
||||
} else {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _updateTitle());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,6 +89,18 @@ class _ViewerScreenState extends State<ViewerScreen> with WindowListener {
|
||||
|
||||
void _onImageManagerChanged() {
|
||||
setState(() => _hasImages = ImageManager.instance.images.isNotEmpty);
|
||||
_updateTitle();
|
||||
}
|
||||
|
||||
/// Taskbar/alt-tab başlığı = açılan dosyanın adı (görsel yoksa uygulama adı).
|
||||
Future<void> _updateTitle() async {
|
||||
final image = ImageManager.instance.currentImagePath;
|
||||
final name = image.isEmpty ? 'imajViewer' : p.basename(image);
|
||||
try {
|
||||
await windowManager.setTitle(name);
|
||||
} catch (_) {
|
||||
// Başlık güncellenemezse sessizce geç.
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _doSave() async {
|
||||
@@ -111,6 +127,36 @@ class _ViewerScreenState extends State<ViewerScreen> with WindowListener {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (_hasImages) ...[
|
||||
Text(AppLocalizations.of(context)!.fileProperties,
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 13)),
|
||||
const SizedBox(height: 4),
|
||||
FutureBuilder<List<(String, String)>>(
|
||||
future: _fileProperties(ImageManager.instance.currentImagePath),
|
||||
builder: (context, snap) {
|
||||
if (!snap.hasData) return const SizedBox(height: 20);
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: snap.data!.map((r) => Padding(
|
||||
padding: const EdgeInsets.only(bottom: 2),
|
||||
child: Text.rich(
|
||||
TextSpan(children: [
|
||||
TextSpan(text: '${r.$1}: ', style: const TextStyle(color: Colors.white70, fontSize: 13)),
|
||||
TextSpan(text: r.$2, style: const TextStyle(color: Colors.white, fontSize: 13)),
|
||||
]),
|
||||
),
|
||||
)).toList(),
|
||||
);
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
const Divider(color: Colors.white24, height: 24),
|
||||
],
|
||||
WindowSizeSelector(
|
||||
workArea: _workArea,
|
||||
onPick: _applyWindowSize,
|
||||
),
|
||||
const Divider(color: Colors.white24, height: 24),
|
||||
Text(AppLocalizations.of(context)!.sortBy,
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 13)),
|
||||
RadioListTile<bool>(
|
||||
@@ -137,36 +183,6 @@ class _ViewerScreenState extends State<ViewerScreen> with WindowListener {
|
||||
setDialogState(() {});
|
||||
},
|
||||
),
|
||||
const Divider(color: Colors.white24, height: 24),
|
||||
WindowSizeSelector(
|
||||
workArea: _workArea,
|
||||
onPick: _applyWindowSize,
|
||||
),
|
||||
const Divider(color: Colors.white24, height: 24),
|
||||
if (_hasImages) ...[
|
||||
Text(AppLocalizations.of(context)!.fileProperties,
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 13)),
|
||||
const SizedBox(height: 4),
|
||||
FutureBuilder<List<(String, String)>>(
|
||||
future: _fileProperties(ImageManager.instance.currentImagePath),
|
||||
builder: (context, snap) {
|
||||
if (!snap.hasData) return const SizedBox(height: 20);
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: snap.data!.map((r) => Padding(
|
||||
padding: const EdgeInsets.only(bottom: 2),
|
||||
child: Text.rich(
|
||||
TextSpan(children: [
|
||||
TextSpan(text: '${r.$1}: ', style: const TextStyle(color: Colors.white70, fontSize: 13)),
|
||||
TextSpan(text: r.$2, style: const TextStyle(color: Colors.white, fontSize: 13)),
|
||||
]),
|
||||
),
|
||||
)).toList(),
|
||||
);
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
],
|
||||
Text('imajViewer $appVersion',
|
||||
style: const TextStyle(color: Colors.white, fontSize: 15)),
|
||||
const SizedBox(height: 4),
|
||||
|
||||
@@ -2,11 +2,12 @@ import 'package:flutter/material.dart';
|
||||
|
||||
import '../l10n/app_localizations.dart';
|
||||
|
||||
/// 8 sütun × 4 satır ekran oranı buton ızgarası.
|
||||
/// Ekran oranı buton ızgarası: 31 buton `a:b` (a dikeyi, b yatayı böler;
|
||||
/// hedef boyut `W/b × H/a`). Sol-üst hücre (1:1) boş placeholder — 1:1 yok
|
||||
/// (title bar çift tık zaten tam ekran).
|
||||
///
|
||||
/// Buton (sütun `b`, satır `a`) etiketi `"$a:$b"` → hedef boyut
|
||||
/// `W/b × H/a` (a dikeyi, b yatayı böler). Sol-üst hücre (1:1) boş
|
||||
/// placeholder — 1:1 yok (title bar çift tık zaten tam ekran).
|
||||
/// Yerleşim: sabit 8 satır × 4 sütun (31-10: geniş/dar transpozesi
|
||||
/// kaldırıldı — kullanıcı kararı).
|
||||
class WindowSizeSelector extends StatelessWidget {
|
||||
final Future<Size?> Function() workArea;
|
||||
final void Function(int rows, int cols, Size work) onPick;
|
||||
@@ -30,43 +31,47 @@ class WindowSizeSelector extends StatelessWidget {
|
||||
scrollDirection: Axis.horizontal,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
for (var a = 1; a <= 4; a++)
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
for (var b = 1; b <= 8; b++)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(right: 4, bottom: 4),
|
||||
child: a == 1 && b == 1
|
||||
? const SizedBox(width: 46, height: 26)
|
||||
: GestureDetector(
|
||||
onTap: () async {
|
||||
final work = await workArea();
|
||||
if (work != null) onPick(a, b, work);
|
||||
},
|
||||
child: Container(
|
||||
width: 46,
|
||||
height: 26,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white10,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
'$a:$b',
|
||||
style: const TextStyle(
|
||||
color: Colors.white, fontSize: 11),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
children: [for (var b = 1; b <= 8; b++) _row(b)],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
/// Satır = `b` (1..8, yatay bölün); satır içinde `a` (1..4, dikey bölün).
|
||||
Widget _row(int b) {
|
||||
return Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
for (var a = 1; a <= 4; a++) _cell(a, b),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget _cell(int a, int b) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(right: 4, bottom: 4),
|
||||
child: a == 1 && b == 1
|
||||
? const SizedBox(width: 46, height: 26)
|
||||
: GestureDetector(
|
||||
onTap: () async {
|
||||
final work = await workArea();
|
||||
if (work != null) onPick(a, b, work);
|
||||
},
|
||||
child: Container(
|
||||
width: 46,
|
||||
height: 26,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white10,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
'$a:$b',
|
||||
style: const TextStyle(color: Colors.white, fontSize: 11),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user