Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e0596afb9f63
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44a01cddde85
Choose a head ref
  • 8 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 22, 2019

  1. Traces everywhere.

    pleroy committed Mar 22, 2019
    Copy the full SHA
    83bcea3 View commit details
  2. Copy the full SHA
    4f232ad View commit details
  3. Remove traces.

    pleroy committed Mar 22, 2019
    Copy the full SHA
    23fae53 View commit details
  4. Restructure the rendering of the flight planner to avoid state change…

    …s between Layout and Repaint.
    pleroy committed Mar 22, 2019
    Copy the full SHA
    dcaa1af View commit details
  5. Cleanup.

    pleroy committed Mar 22, 2019
    Copy the full SHA
    8b4cde0 View commit details
  6. More cleanup.

    pleroy committed Mar 22, 2019
    Copy the full SHA
    06d46b4 View commit details

Commits on Mar 23, 2019

  1. After egg's review.

    pleroy committed Mar 23, 2019
    Copy the full SHA
    284bcf1 View commit details

Commits on Mar 24, 2019

  1. Merge pull request #2104 from pleroy/Exception

    Restructure the rendering of the flight plan
    pleroy authored Mar 24, 2019
    Copy the full SHA
    44a01cd View commit details
Showing with 203 additions and 175 deletions.
  1. +1 −0 ksp_plugin/interface.cpp
  2. +7 −7 ksp_plugin_adapter/differential_slider.cs
  3. +195 −168 ksp_plugin_adapter/flight_planner.cs
1 change: 1 addition & 0 deletions ksp_plugin/interface.cpp
Original file line number Diff line number Diff line change
@@ -572,6 +572,7 @@ bool principia__HasVessel(Plugin* const plugin,
char const* const vessel_guid) {
journal::Method<journal::HasVessel> m({plugin, vessel_guid});
CHECK_NOTNULL(plugin);
CHECK_NOTNULL(vessel_guid);
return m.Return(plugin->HasVessel(vessel_guid));
}

14 changes: 7 additions & 7 deletions ksp_plugin_adapter/differential_slider.cs
Original file line number Diff line number Diff line change
@@ -44,20 +44,20 @@ public bool Render(bool enabled) {
if (text_colour_.HasValue) {
style.normal.textColor = text_colour_.Value;
}
UnityEngine.GUILayout.Label(
text : label_,
options : UnityEngine.GUILayout.Width(75),
style : style);
UnityEngine.GUILayout.Label(text : label_,
options : UnityEngine.GUILayout.Width(75),
style : style);

var old_alignment = UnityEngine.GUI.skin.label.alignment;
UnityEngine.GUI.skin.label.alignment = UnityEngine.TextAnchor.UpperRight;
UnityEngine.GUILayout.Label(
text : format_(value),
options : UnityEngine.GUILayout.Width(125 + (unit_ == null ? 50 : 0)));
options : UnityEngine.GUILayout.Width(
125 + (unit_ == null ? 50 : 0)));
UnityEngine.GUI.skin.label.alignment = old_alignment;
UnityEngine.GUILayout.Label(
text : unit_ ?? "",
options : UnityEngine.GUILayout.Width(unit_ == null ? 0 : 50));
text : unit_ ?? "",
options : UnityEngine.GUILayout.Width(unit_ == null ? 0 : 50));

if (enabled) {
if (!UnityEngine.Input.GetMouseButton(0)) {
Loading