Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 20:38:27 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[paparazzi center] slightly less restrictive minimum size

Browse Source 
by assigning a default? width to the combo boxes
improves #1167, but does not yet quite fix it
This commit is contained in:
Felix Ruess
2015-05-02 21:01:09 +02:00
parent 64400ba889
commit cae0756410
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/lib/ocaml/gtk_tools.ml
+2 -2
View File
@@ -78,9 +78,9 @@ let combo_values_list = fun (combo : combo) ->
let combo_separator = "--" let combo_separator = "--"
let combo = fun strings vbox -> let combo = fun ?width strings vbox ->
let (combo, (tree, column)) = let (combo, (tree, column)) =
GEdit.combo_box_text ~packing:vbox#add ~strings () in GEdit.combo_box_text ~packing:vbox#add ~strings ?width () in
combo#set_active 0; combo#set_active 0;
combo#set_row_separator_func combo#set_row_separator_func
(Some (fun m row -> m#get ~row ~column = combo_separator)) ; (Some (fun m row -> m#get ~row ~column = combo_separator)) ;
sw/lib/ocaml/gtk_tools.mli
+1 -1
View File
@@ -48,7 +48,7 @@ type combo
val combo_widget : combo -> GEdit.combo_box val combo_widget : combo -> GEdit.combo_box
val combo_model : combo -> (GTree.list_store * string GTree.column) val combo_model : combo -> (GTree.list_store * string GTree.column)
val combo : string list -> < add : GObj.widget -> unit; .. > -> combo val combo : ?width:int -> string list -> < add : GObj.widget -> unit; .. > -> combo
val add_to_combo : combo -> string -> unit val add_to_combo : combo -> string -> unit
val combo_separator : string val combo_separator : string
sw/supervision/paparazzicenter.ml
+2 -2
View File
@@ -209,8 +209,8 @@ let () =
Utils.build_aircrafts (); Utils.build_aircrafts ();
let ac_combo = AC.parse_conf_xml gui#vbox_ac let ac_combo = AC.parse_conf_xml gui#vbox_ac
and target_combo = Gtk_tools.combo ["sim";"fbw";"ap"] gui#vbox_target and target_combo = Gtk_tools.combo ~width:50 ["sim";"fbw";"ap"] gui#vbox_target
and flash_combo = Gtk_tools.combo ["Default mode"] gui#vbox_flash in and flash_combo = Gtk_tools.combo ~width:50 ["Default mode"] gui#vbox_flash in
(Gtk_tools.combo_widget target_combo)#misc#set_sensitive false; (Gtk_tools.combo_widget target_combo)#misc#set_sensitive false;
(Gtk_tools.combo_widget flash_combo)#misc#set_sensitive false; (Gtk_tools.combo_widget flash_combo)#misc#set_sensitive false;
sw/supervision/pc_control_panel.ml
+1 -1
View File
@@ -213,7 +213,7 @@ let supervision = fun ?file gui log (ac_combo : Gtk_tools.combo) (target_combo :
in in
(* Sessions *) (* Sessions *)
let session_combo = Gtk_tools.combo [] gui#vbox_session in let session_combo = Gtk_tools.combo ~width:50 [] gui#vbox_session in
let remove_custom_sessions = fun () -> let remove_custom_sessions = fun () ->
let (store, _column) = Gtk_tools.combo_model session_combo in let (store, _column) = Gtk_tools.combo_model session_combo in