refs #99, tweak some bugs related to added first empty bar

Author: yjpark

crates/notation_bevy/src/play/play_button.rs

@@ -110,7 +110,7 @@ impl PlayButtonShape {
             PlayButtonAction::SetBegin |
             PlayButtonAction::SetEnd |
             PlayButtonAction::Clear =>
-                theme.colors.ui.of_button(self.begin_bar_ordinal != 0 || self.end_bar_ordinal != self.bars),
+                theme.colors.ui.of_button(self.begin_bar_ordinal != 0 || self.end_bar_ordinal + 1 != self.bars),
         }
     }
 }
@@ -164,7 +164,7 @@ impl PlayButton {
             should_loop: settings.should_loop,
             bars: tab.bars.len(),
             begin_bar_ordinal: 0,
-            end_bar_ordinal: tab.bars.len(),
+            end_bar_ordinal: if tab.bars.len() > 0 { tab.bars.len() - 1 } else { 0 },
         };
         button_shape.create(commands, theme, button_entity);
         button_entity

crates/notation_bevy/src/tab/tab_state.rs

@@ -60,7 +60,7 @@ impl TabState {
         self.play_control.is_bar_in_range(bar_ordinal)
     }
     pub fn is_bar_selected(&self, bar_ordinal: usize) -> bool {
-        if self.play_control.begin_bar_ordinal != 0 || self.play_control.end_bar_ordinal != self.tab.bars.len() {
+        if self.play_control.begin_bar_ordinal != 0 || self.play_control.end_bar_ordinal + 1 != self.tab.bars.len() {
             self.play_control.is_bar_in_range(bar_ordinal)
         } else {
             false

crates/notation_bevy/src/viewer/control.rs

@@ -179,8 +179,8 @@ impl ControlView {
         midi_state: &mut MidiState,
         play_control_evts: &mut EventWriter<PlayControlEvent>,
     ) {
-        midi_state.play_control.begin_bar_ordinal = 1;
-        midi_state.play_control.end_bar_ordinal = midi_state.play_control.bars;
+        midi_state.play_control.begin_bar_ordinal = 0;
+        midi_state.play_control.end_bar_ordinal = midi_state.play_control.get_last_car_ordinal();
         Self::send_begin_end_evt(midi_state, play_control_evts);
     }
     pub fn set_begin_bar_ordinal(

crates/notation_model/src/play/play_control.rs

@@ -90,6 +90,9 @@ impl PlayControl {
             play_speed: PlaySpeed::new(tab_meta),
         }
     }
+    pub fn get_last_car_ordinal(&self) -> usize {
+        if self.bars > 0 { self.bars - 1 } else { 0 }
+    }
     pub fn new(tab: &Tab) -> Self {
         Self::_new(&tab.meta, tab.bars.len())
     }