From 79e1866e85696f6441ea60f7b17e65c6dba98364 Mon Sep 17 00:00:00 2001 From: fourthline Date: Sun, 24 Nov 2013 11:37:26 +0900 Subject: [PATCH] =?UTF-8?q?=E6=A9=9F=E8=83=BD=E8=AA=AC=E6=98=8E=E7=94=A8?= =?UTF-8?q?=E3=81=AE=E7=94=BB=E5=83=8F=E3=81=A7=E3=81=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/mml_time1.png | Bin 0 -> 5826 bytes doc/mml_time2.png | Bin 0 -> 4889 bytes src/fourthline/mabiicco/ui/MMLSeqView.java | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 doc/mml_time1.png create mode 100644 doc/mml_time2.png diff --git a/doc/mml_time1.png b/doc/mml_time1.png new file mode 100644 index 0000000000000000000000000000000000000000..6767f7f97c29a805371e08675a37cce241eb2d76 GIT binary patch literal 5826 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 literal 0 HcmV?d00001 diff --git a/doc/mml_time2.png b/doc/mml_time2.png new file mode 100644 index 0000000000000000000000000000000000000000..7758da171221d8b17d5fbdc2f075ce27f118f052 GIT binary patch literal 4889 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 literal 0 HcmV?d00001 diff --git a/src/fourthline/mabiicco/ui/MMLSeqView.java b/src/fourthline/mabiicco/ui/MMLSeqView.java index 4f24c79c..cc4aa2c0 100644 --- a/src/fourthline/mabiicco/ui/MMLSeqView.java +++ b/src/fourthline/mabiicco/ui/MMLSeqView.java @@ -503,9 +503,9 @@ private void updateTimeView() { double totalTime = MMLTempoEvent.getTimeOnTickOffset(tempoList, totalTick); int tempo = MMLTempoEvent.searchOnTick(tempoList, (int)position); - String str = String.format("time %d:%02d/%d:%02d (t%d)", - (int)(time/60), (int)(time%60), - (int)(totalTime/60), (int)(totalTime%60), + String str = String.format("time %d:%04.1f/%d:%04.1f (t%d)", + (int)(time/60), (time%60), + (int)(totalTime/60), (totalTime%60), tempo); if (timeView != null) { timeView.setText(str);