fini l'amélioration du rendu de texte normalement=

global/Global.gd

@@ -28,7 +28,7 @@ var cdar: Array = [current_date["year"], current_date["month"], current_date["da
 
 var cal: Calendar = Calendar.new();
 
-var settings: Dictionary = {
+const default_settings: Dictionary = {
 	"font_size": 100, # %
 	"language": 0,
 	"data_path": DATA_PATH,
@@ -38,6 +38,8 @@ var settings: Dictionary = {
 	"end_lat": "\\]"
 };
 
+var settings: Dictionary = default_settings;
+
 var original_font_sizes: Dictionary = {};
 
 var already_modif_fonts: Array = [];
@@ -90,10 +92,9 @@ func load_params() -> void:
 		file.open(SETTINGS_PATH, File.READ);
 		settings = JSON.parse(file.get_as_text()).result;
 		file.close();
-		if not "deb_lat" in settings.keys():
-			settings["deb_lat"] = "\\[";
-		if not "end_lat" in settings.keys():
-			settings["end_lat"] = "\\]";
+		for k in default_settings.keys():
+			if not k in settings.keys():
+				settings[k] = default_settings[k];
 
 func save_params():
 	file.open(SETTINGS_PATH, File.WRITE);

pages/RenderTextNew.gd

@@ -23,43 +23,34 @@ func create_math(t: String) -> Control:
 	var ctr: Control = Control.new();
 	ctr.name = "Control";
 	ctr.mouse_filter = Control.MOUSE_FILTER_IGNORE;
-	# ctr.anchor_left = 0;
-	# ctr.anchor_top = 0;
-	# ctr.anchor_bottom = 1;
-	# ctr.anchor_right = 1;
-	# ctr.size_flags_horizontal = SIZE_EXPAND_FILL;
-	# ctr.size_flags_vertical = SIZE_EXPAND_FILL;
-	# FOR DEBUGGING
-	var pnl: Panel = Panel.new();
-	pnl.anchor_left = 0;
-	pnl.anchor_top = 0;
-	pnl.anchor_bottom = 1;
-	pnl.anchor_right = 1;
-	ctr.add_child(pnl);
 	#
 	var ctr2: Control = Control.new();
 	ctr2.name = "Control";
 	ctr2.mouse_filter = Control.MOUSE_FILTER_IGNORE;
-	ctr.anchor_left = 0.5;
-	ctr.anchor_top = 0.5;
-	ctr.anchor_bottom = 0.5;
-	ctr.anchor_right = 0.5;
+	ctr2.anchor_left = 0.5;
+	ctr2.anchor_top = 0.5;
+	ctr2.anchor_bottom = 0.5;
+	ctr2.anchor_right = 0.5;
 	ctr.add_child(ctr2);
 	var sprt: Sprite = Sprite.new();
 	sprt.name = "Sprite";
 	ctr2.add_child(sprt);
 	sprt.set_script(load("res://addons/GodoTeX/LaTeX.cs"));
+	sprt.FontSize = 80;
+	sprt.scale = Vector2(0.25, 0.25);
 	sprt.LatexExpression = t;
 	sprt.Render();
 	#
-	sprt.position = Vector2(0,0);
+	sprt.position = Vector2(0,5.0*float(Global.settings["font_size"])/100.0);
+	sprt.centered = true;
 	ctr.rect_min_size = sprt.texture.size * sprt.scale;
+	ctr.rect_min_size.y /= 2.0;
 	return ctr;
 
 func create_empty_row() -> Node:
 	var lbl = Panel.new();
 	lbl.modulate = Color(0, 0, 0, 0);
-	lbl.rect_min_size.x = hflow.rect_size.x*1.5;
+	lbl.rect_min_size.x = hflow.rect_size.x*1;
 	lbl.mouse_filter = Control.MOUSE_FILTER_IGNORE;
 	return lbl;
 
@@ -92,17 +83,16 @@ func decompose_parties_base(txt: String) -> void:
 		if idm == 0 or txt[idm-1] != "\\":
 			# On cherche s'il y a bien une balise de fermeture pour la séquence de math
 			var ifm: int = txt.find(el, idm+len(dl));
-			var good: bool = false;
 			while ifm != -1 and txt[ifm-1] == "\\": # On en a trouvée une, mais elle est annulée par un '\'
 				ifm = txt.find(el, ifm+len(ifm)); # Donc on en cherche une plus loin
 			if ifm != -1:
 				# On ajoute d'abord le text avant :
-				decompose_text(txt.substr(i0, idm));
+				decompose_text(txt.substr(i0, idm-i0));
 				# On ajoute ensuite la partie de math
 				parties.append([txt.substr(idm+len(dl), ifm-idm-len(el)), 1]);
 				# On update le curseur dans notre texte
-				i0 = ifm+len(dl);
-			if not good:
+				i0 = ifm+len(el);
+			else:
 				# Il n'y a pas de parties de math
 				# On ajoute tout le texte restant
 				decompose_text(txt.substr(i0));
@@ -145,6 +135,10 @@ func _process(delta):
 			changed = false;
 			for c in hflow.get_children():
 				if c is Control and not (c is Label or c is Panel):
-					var sprt = c.get_node("Control/Sprite");
-					sprt.position = Vector2(0,0);
+					var sprt: Sprite = c.get_node("Control/Sprite");
+					sprt.position = Vector2(0,5.0*float(Global.settings["font_size"])/100.0);
+					sprt.centered = true;
 					c.rect_min_size = sprt.texture.size * sprt.scale;
+					c.rect_min_size.y /= 2.0;
+			#
+			$Control.rect_min_size = $Control/HFlowContainer.rect_size;

pages/sheets/A reviser/A reviser.gd

@@ -50,6 +50,7 @@ func _ready():
 			bt.get_node("Bt_activ").connect("pressed", self, "_on_bt_fiche_activ_pressed", [lf]);
 			bt.rect_min_size.y = 55;
 			bt.set_text(f["titre"]);
+			bt.get_node("Button").modulate = cl;
 			$VBoxContainer/ScrollContainer/VBoxContainer.add_child(bt);
 
 

pages/sheets/A reviser/A reviser.tscn

@@ -20,11 +20,11 @@ margin_bottom = -10.0
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 margin_right = 520.0
-margin_bottom = 37.0
+margin_bottom = 35.0
 
 [node name="Bt_retour" type="Button" parent="VBoxContainer/HBoxContainer"]
-margin_right = 84.0
-margin_bottom = 37.0
+margin_right = 78.0
+margin_bottom = 35.0
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 custom_colors/font_color_hover = Color( 0, 0, 0, 1 )
 custom_styles/hover = ExtResource( 3 )
@@ -33,30 +33,30 @@ custom_styles/normal = ExtResource( 1 )
 text = "retour"
 
 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer"]
-margin_left = 88.0
+margin_left = 82.0
 margin_right = 520.0
-margin_bottom = 37.0
+margin_bottom = 35.0
 size_flags_horizontal = 3
 size_flags_vertical = 7
 text = "Fiches à réviser en priorité :"
 align = 1
 valign = 1
 
 [node name="HSeparator" type="HSeparator" parent="VBoxContainer"]
-margin_top = 41.0
+margin_top = 39.0
 margin_right = 520.0
-margin_bottom = 45.0
+margin_bottom = 43.0
 
 [node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
-margin_top = 49.0
+margin_top = 47.0
 margin_right = 520.0
 margin_bottom = 940.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/ScrollContainer"]
 margin_right = 520.0
-margin_bottom = 891.0
+margin_bottom = 893.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 

pages/sheets/Bt_Dossier.tscn

@@ -50,9 +50,9 @@ stretch_mode = 6
 
 [node name="Label" type="Label" parent="Button/HBoxContainer"]
 margin_left = 49.0
-margin_top = 459.0
+margin_top = 460.0
 margin_right = 471.0
-margin_bottom = 490.0
+margin_bottom = 489.0
 size_flags_horizontal = 3
 size_flags_vertical = 6
 custom_colors/font_color = Color( 0, 0, 0, 1 )

pages/sheets/Feuille_Elt_mode2.tscn

@@ -28,7 +28,7 @@ margin_right = 520.0
 margin_bottom = 40.0
 
 [node name="Bt_retour" type="Button" parent="VBoxContainer/HBoxContainer"]
-margin_right = 84.0
+margin_right = 78.0
 margin_bottom = 40.0
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 custom_colors/font_color_hover = Color( 0, 0, 0, 1 )
@@ -39,7 +39,7 @@ custom_styles/normal = ExtResource( 6 )
 text = "retour"
 
 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer"]
-margin_left = 88.0
+margin_left = 82.0
 margin_right = 476.0
 margin_bottom = 40.0
 size_flags_horizontal = 3
@@ -101,20 +101,20 @@ size_flags_vertical = 3
 [node name="RenderText" parent="VBoxContainer/BoxRender" instance=ExtResource( 5 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_right = 488.0
+margin_right = 489.0
 margin_bottom = 421.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/BoxRender"]
-margin_left = 492.0
+margin_left = 493.0
 margin_right = 520.0
 margin_bottom = 421.0
 alignment = 2
 
 [node name="Bt_hide_rendert" type="Button" parent="VBoxContainer/BoxRender/VBoxContainer"]
-margin_top = 384.0
-margin_right = 28.0
+margin_top = 386.0
+margin_right = 27.0
 margin_bottom = 421.0
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 custom_colors/font_color_hover = Color( 0, 0, 0, 1 )
@@ -132,19 +132,22 @@ size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="TextEdit" type="TextEdit" parent="VBoxContainer/BoxEdit"]
-margin_right = 488.0
+margin_right = 489.0
 margin_bottom = 422.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+show_line_numbers = true
+draw_tabs = true
+wrap_enabled = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/BoxEdit"]
-margin_left = 492.0
+margin_left = 493.0
 margin_right = 520.0
 margin_bottom = 422.0
 
 [node name="Bt_hide_textedit" type="Button" parent="VBoxContainer/BoxEdit/VBoxContainer"]
-margin_right = 28.0
-margin_bottom = 37.0
+margin_right = 27.0
+margin_bottom = 35.0
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 custom_colors/font_color_hover = Color( 0, 0, 0, 1 )
 custom_colors/font_color_pressed = Color( 0, 0, 0, 1 )

pages/sheets/Sheet_Element_Row_Ref.tscn

@@ -108,10 +108,10 @@ wrap_enabled = true
 [node name="Bt_delete" type="Button" parent="C2"]
 modulate = Color( 0.988235, 0, 0, 1 )
 margin_left = 228.0
-margin_top = 463.0
+margin_top = 460.0
 margin_right = 268.0
-margin_bottom = 496.0
-rect_min_size = Vector2( 40, 0 )
+margin_bottom = 500.0
+rect_min_size = Vector2( 40, 40 )
 size_flags_vertical = 6
 custom_styles/hover = ExtResource( 3 )
 custom_styles/pressed = ExtResource( 5 )

pages/sheets/create_dossier.tscn

@@ -20,60 +20,60 @@ margin_bottom = -10.0
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 margin_right = 520.0
-margin_bottom = 31.0
+margin_bottom = 29.0
 
 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer"]
 margin_right = 520.0
-margin_bottom = 31.0
+margin_bottom = 29.0
 size_flags_horizontal = 3
 size_flags_vertical = 7
 text = "Créer/Modifier un dossier :"
 align = 1
 valign = 1
 
 [node name="HSeparator" type="HSeparator" parent="VBoxContainer"]
-margin_top = 35.0
+margin_top = 33.0
 margin_right = 520.0
-margin_bottom = 39.0
+margin_bottom = 37.0
 
 [node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
-margin_top = 43.0
+margin_top = 41.0
 margin_right = 520.0
 margin_bottom = 940.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="Inputs" type="VBoxContainer" parent="VBoxContainer/ScrollContainer"]
 margin_right = 520.0
-margin_bottom = 897.0
+margin_bottom = 899.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="HSeparator3" type="HSeparator" parent="VBoxContainer/ScrollContainer/Inputs"]
 modulate = Color( 1, 1, 1, 0 )
 margin_right = 520.0
-margin_bottom = 255.0
+margin_bottom = 257.0
 size_flags_vertical = 3
 
 [node name="Titre" type="VBoxContainer" parent="VBoxContainer/ScrollContainer/Inputs"]
-margin_top = 259.0
+margin_top = 261.0
 margin_right = 520.0
-margin_bottom = 335.0
+margin_bottom = 333.0
 
 [node name="Label" type="Label" parent="VBoxContainer/ScrollContainer/Inputs/Titre"]
 margin_right = 520.0
-margin_bottom = 31.0
+margin_bottom = 29.0
 text = "Nom :"
 
 [node name="LineEdit" type="LineEdit" parent="VBoxContainer/ScrollContainer/Inputs/Titre"]
-margin_top = 35.0
+margin_top = 33.0
 margin_right = 520.0
-margin_bottom = 76.0
+margin_bottom = 72.0
 placeholder_text = "Nom du dossier"
 
 [node name="HSeparator" type="HSeparator" parent="VBoxContainer/ScrollContainer/Inputs"]
 modulate = Color( 1, 1, 1, 0 )
-margin_top = 339.0
+margin_top = 337.0
 margin_right = 520.0
 margin_bottom = 594.0
 size_flags_vertical = 3
@@ -145,7 +145,7 @@ text = "Valider"
 modulate = Color( 1, 1, 1, 0 )
 margin_top = 642.0
 margin_right = 520.0
-margin_bottom = 897.0
+margin_bottom = 899.0
 size_flags_vertical = 3
 
 [connection signal="pressed" from="VBoxContainer/ScrollContainer/Inputs/VBoxContainer2/Bt_Delete" to="." method="_on_Bt_Delete_pressed"]