X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler%2Fmusic_sampler.kv;h=ffc2797e0bf44c8df87dbd2fba7e6940b5091a75;hb=4d1dfc89066e8dbccf7e5049686895de6fcb32d2;hp=afb99e411907a9e0c7de411bdb9f98a3f2d5f68a;hpb=60aa2bed939858f9aec4252071c8efd99baac7e3;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler/music_sampler.kv b/music_sampler/music_sampler.kv
index afb99e4..ffc2797 100644
--- a/music_sampler/music_sampler.kv
+++ b/music_sampler/music_sampler.kv
@@ -109,21 +109,8 @@
   play_list_y: self.border
   play_list_x: self.action_list_width + self.key_list_width + 3 * self.border
 
-  max_height: max(mock_symbola.height, mock_ubuntu_regular.height, mock_ubuntu_bold.height)
-  min_height: min(mock_symbola.height, mock_ubuntu_regular.height, mock_ubuntu_bold.height)
-  symbola_line_height: self.min_height / max(mock_symbola.height,1)
-  ubuntu_regular_line_height: self.min_height / max(mock_ubuntu_regular.height,1)
-  ubuntu_bold_line_height: self.min_height / max(mock_ubuntu_bold.height,1)
+  max_height: 1.3 * math.ceil(2 * math.sqrt(self.key_size or 10))
 
-  Label:
-    id: mock_symbola
-    font_name: "Symbola"
-    font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
-    color: 0, 0, 0, 0
-    text: "A"
-    text_size: None, None
-    size_hint: None, None
-    size: self.texture_size
   Label:
     id: mock_ubuntu_regular
     font_name: "Ubuntu"
@@ -133,16 +120,6 @@
     text_size: None, None
     size_hint: None, None
     size: self.texture_size
-  Label:
-    id: mock_ubuntu_bold
-    font_name: "Ubuntu"
-    bold: True
-    font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
-    color: 0, 0, 0, 0
-    text: "A"
-    text_size: None, None
-    size_hint: None, None
-    size: self.texture_size
 
   Mapping:
     id: Mapping
@@ -227,6 +204,7 @@
 <ActionList>:
   size_hint: None, None
   labels_height: self.parent.max_height or 1
+  font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
   canvas:
     Color:
       rgba: 250./255, 250./255, 250./255, 1
@@ -237,7 +215,7 @@
     id: action_list_title
     font_name: "Ubuntu"
     bold: True
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
+    font_size: self.parent.font_size
     color: 0, 0, 0, 1
     text: self.parent.action_title
     text_size: None, self.parent.height
@@ -246,15 +224,21 @@
     size_hint: None, None
     size: self.texture_size[0], self.parent.height
   ActionListIcons:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     size_hint: 0.02, 0.9
     pos_hint: { 'x': 0, 'top': 0.9 }
   ActionListDescriptions:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     size_hint: 0.98, 0.9
     pos_hint: { 'x': 0.02, 'top': 0.9 }
 
 <ActionListIcon>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Symbola"
   color: 0, 0, 0, 1
   text_size: None, None
@@ -263,6 +247,8 @@
   width: self.texture_size[0]
 
 <ActionListDescription>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Ubuntu"
   color: 0, 0, 0, 1
   text_size: self.width, None
@@ -275,6 +261,7 @@
 <PlayList>:
   size_hint: None, None
   labels_height: self.parent.max_height or 1
+  font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
   canvas:
     Color:
       rgba: 250./255, 250./255, 250./255, 1
@@ -282,19 +269,27 @@
       pos:  0, 0
       size: self.width, self.height
   PlayListIcons:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     size_hint: 0.05, 1
     pos_hints: { 'x': 0, 'top': 0 }
   PlayListNames:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     pos_hint: { 'x': 0.05, 'bottom': 0 }
     size_hint: 0.65, 1
   PlayListTimes:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     pos_hint: { 'x': 0.7, 'bottom': 0 }
     size_hint: 0.30, 1
  
 <PlayListIcon>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Symbola"
   color: 0, 0, 0, 1
   text_size: None, None
@@ -303,6 +298,8 @@
   width: self.texture_size[0]
 
 <PlayListName>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Ubuntu"
   color: 0, 0, 0, 1
   text_size: self.width, None
@@ -313,6 +310,8 @@
   size_hint: 1, None
 
 <PlayListTime>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   canvas.before:
     Color:
       rgba: 250./255, 250./255, 250./255, 1