Skip to content

Commit

Permalink
Ducks up the BusyIndicator
Browse files Browse the repository at this point in the history
Code Explorer, Inspection Results and Test Explorer are now completely
ducked. Thansk to PeterMTaylor for strict design oversight.
  • Loading branch information
ThunderFrame committed Mar 27, 2017
1 parent 967c813 commit 07f09c4
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 12 deletions.
2 changes: 1 addition & 1 deletion RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
Expand Up @@ -751,7 +751,7 @@
</i:Interaction.Behaviors>
</TreeView>

<controls:BusyIndicator Grid.Row="1" Width="36" Height="36" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibility}}" />
<controls:BusyIndicator Grid.Row="1" Width="120" Height="120" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibility}}" />

<GridSplitter Grid.Row="2" Height="5" ShowsPreview="True" Cursor="SizeNS" HorizontalAlignment="Stretch"/>

Expand Down
35 changes: 26 additions & 9 deletions RetailCoder.VBE/UI/Controls/BusyIndicator.xaml
Expand Up @@ -36,15 +36,32 @@
</Style.Triggers>
</Style>
</Canvas.Style>
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="1.0" Canvas.Left="50" Canvas.Top="0" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.9" Canvas.Left="20.6107373853764" Canvas.Top="9.54915028125262" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.8" Canvas.Left="2.44717418524233" Canvas.Top="34.5491502812526" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.7" Canvas.Left="2.44717418524232" Canvas.Top="65.4508497187474" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.6" Canvas.Left="20.6107373853763" Canvas.Top="90.4508497187474" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.5" Canvas.Left="50" Canvas.Top="100" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.4" Canvas.Left="79.3892626146236" Canvas.Top="90.4508497187474" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.3" Canvas.Left="97.5528258147577" Canvas.Top="65.4508497187474" />
<Ellipse Width="20" Height="20" Stretch="Fill" Fill="DarkBlue" Opacity="0.2" Canvas.Left="97.5528258147577" Canvas.Top="34.5491502812526" />
<!-- Layer 1/<Compound Path> -->
<Path Fill="#ff00569a" Data="F1 M 59.161,3.800 C 58.905,4.201 58.172,3.858 57.795,3.530 C 57.448,3.227 57.148,2.782 57.385,2.468 C 57.622,2.154 58.360,2.454 58.621,2.656 C 58.881,2.859 59.417,3.400 59.161,3.800 Z M 64.432,9.293 C 63.737,8.830 62.043,7.961 61.840,7.918 C 61.637,7.874 61.102,6.918 61.478,6.716 C 61.855,6.513 63.998,5.470 63.998,4.935 C 63.998,4.399 63.375,4.355 63.375,4.355 C 63.375,3.950 63.270,3.898 63.270,3.898 C 63.686,3.330 63.853,2.111 63.172,2.111 C 62.845,2.111 61.715,2.897 60.895,2.969 C 60.856,2.973 60.817,2.975 60.779,2.975 C 60.493,2.975 60.469,2.367 59.487,1.582 C 58.867,1.087 58.274,0.520 57.960,0.382 C 57.653,0.129 57.393,0.000 56.791,0.000 C 56.255,0.000 55.809,0.323 55.469,0.504 C 55.328,0.578 52.066,1.908 52.066,4.862 C 52.066,7.816 54.441,9.293 54.441,9.293 C 54.441,9.293 54.166,9.583 54.006,9.916 C 53.557,9.921 52.380,10.596 51.704,10.596 C 51.110,10.596 49.184,9.346 48.055,9.496 C 47.635,9.552 47.287,10.148 47.287,11.248 C 47.287,16.085 48.924,19.661 55.512,19.661 C 59.639,19.661 64.681,17.993 65.938,16.635 C 66.889,15.679 67.325,14.212 67.285,12.957 C 66.966,11.200 65.127,9.757 64.432,9.293 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.9" Fill="#ff00569a" Data="F1 M 25.770,13.432 C 25.799,13.906 25.004,14.060 24.506,14.016 C 24.047,13.975 23.543,13.791 23.550,13.398 C 23.557,13.005 24.330,12.813 24.660,12.824 C 24.990,12.835 25.741,12.958 25.770,13.432 Z M 33.263,14.778 C 32.428,14.811 30.547,15.104 30.357,15.188 C 30.168,15.272 29.173,14.814 29.358,14.429 C 29.543,14.043 30.664,11.940 30.350,11.507 C 30.035,11.073 29.505,11.404 29.505,11.404 C 29.267,11.076 29.151,11.096 29.151,11.096 C 29.154,10.392 28.573,9.307 28.022,9.708 C 27.758,9.900 27.305,11.200 26.685,11.740 C 26.655,11.767 26.624,11.791 26.593,11.813 C 26.362,11.981 25.986,11.503 24.730,11.446 C 23.937,11.410 23.124,11.300 22.789,11.372 C 22.392,11.348 22.106,11.397 21.619,11.751 C 21.185,12.066 21.014,12.589 20.845,12.935 C 20.775,13.078 18.918,16.072 20.654,18.462 C 22.390,20.851 25.180,20.651 25.180,20.651 C 25.180,20.651 25.127,21.047 25.194,21.410 C 24.834,21.677 24.278,22.916 23.731,23.314 C 23.251,23.662 20.958,23.783 20.132,24.568 C 19.825,24.860 19.895,25.546 20.541,26.437 C 23.384,30.349 26.810,32.281 32.141,28.409 C 35.479,25.983 38.578,21.670 38.796,19.832 C 39.004,18.500 38.494,17.057 37.724,16.065 C 36.434,14.831 34.098,14.744 33.263,14.778 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.8" Fill="#ff00569a" Data="F1 M 4.417,40.851 C 4.719,41.218 4.167,41.810 3.738,42.067 C 3.343,42.303 2.827,42.451 2.601,42.129 C 2.376,41.807 2.889,41.197 3.162,41.012 C 3.436,40.827 4.115,40.484 4.417,40.851 Z M 11.270,37.536 C 10.615,38.053 9.265,39.396 9.161,39.576 C 9.057,39.755 7.982,39.969 7.906,39.549 C 7.829,39.128 7.500,36.767 6.991,36.602 C 6.481,36.436 6.247,37.015 6.247,37.015 C 5.862,36.890 5.780,36.973 5.780,36.973 C 5.368,36.402 4.260,35.867 4.050,36.514 C 3.949,36.825 4.347,38.143 4.163,38.945 C 4.154,38.984 4.144,39.021 4.132,39.058 C 4.044,39.329 3.458,39.164 2.409,39.856 C 1.746,40.293 1.023,40.681 0.795,40.937 C 0.460,41.151 0.257,41.358 0.071,41.931 C -0.095,42.440 0.074,42.965 0.141,43.344 C 0.169,43.501 0.425,47.015 3.235,47.927 C 6.044,48.840 8.183,47.038 8.183,47.038 C 8.183,47.038 8.373,47.389 8.641,47.644 C 8.506,48.072 8.785,49.401 8.576,50.044 C 8.393,50.608 6.609,52.054 6.402,53.174 C 6.325,53.591 6.785,54.105 7.831,54.445 C 12.431,55.940 16.338,55.489 18.374,49.223 C 19.650,45.298 19.621,39.988 18.718,38.372 C 18.103,37.172 16.842,36.305 15.636,35.955 C 13.866,35.715 11.926,37.018 11.270,37.536 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.7" Fill="#ff00569a" Data="F1 M 3.259,75.584 C 3.719,75.704 3.620,76.508 3.424,76.967 C 3.244,77.391 2.912,77.813 2.541,77.685 C 2.170,77.557 2.226,76.763 2.338,76.452 C 2.450,76.142 2.799,75.465 3.259,75.584 Z M 6.854,68.874 C 6.628,69.678 6.326,71.558 6.347,71.764 C 6.368,71.971 5.625,72.775 5.316,72.480 C 5.007,72.185 3.353,70.469 2.843,70.634 C 2.334,70.800 2.485,71.405 2.485,71.405 C 2.099,71.531 2.082,71.647 2.082,71.647 C 1.414,71.426 0.203,71.644 0.413,72.292 C 0.514,72.603 1.611,73.434 1.933,74.192 C 1.948,74.228 1.962,74.265 1.974,74.301 C 2.062,74.573 1.491,74.783 1.049,75.960 C 0.770,76.703 0.413,77.442 0.379,77.783 C 0.234,78.153 0.191,78.440 0.377,79.013 C 0.543,79.522 0.987,79.847 1.265,80.115 C 1.379,80.226 3.652,82.917 6.462,82.004 C 9.271,81.092 9.942,78.377 9.942,78.377 C 9.942,78.377 10.302,78.549 10.668,78.597 C 10.812,79.023 11.818,79.934 12.027,80.577 C 12.210,81.141 11.617,83.359 12.108,84.387 C 12.291,84.770 12.965,84.916 14.012,84.576 C 18.611,83.081 21.507,80.420 19.471,74.154 C 18.196,70.229 15.052,65.949 13.371,65.173 C 12.168,64.564 10.638,64.603 9.457,65.029 C 7.885,65.875 7.080,68.070 6.854,68.874 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.6" Fill="#ff00569a" Data="F1 M 22.738,104.365 C 23.180,104.191 23.572,104.900 23.684,105.387 C 23.787,105.836 23.768,106.372 23.392,106.487 C 23.016,106.602 22.595,105.925 22.503,105.608 C 22.411,105.291 22.295,104.539 22.738,104.365 Z M 21.702,96.823 C 21.992,97.606 22.852,99.305 22.991,99.459 C 23.129,99.614 23.001,100.702 22.577,100.645 C 22.153,100.587 19.807,100.171 19.492,100.605 C 19.177,101.038 19.655,101.439 19.655,101.439 C 19.417,101.767 19.471,101.871 19.471,101.871 C 18.801,102.086 17.949,102.974 18.500,103.374 C 18.764,103.566 20.140,103.595 20.846,104.018 C 20.881,104.038 20.913,104.060 20.944,104.082 C 21.175,104.250 20.837,104.756 21.171,105.968 C 21.381,106.733 21.528,107.541 21.700,107.837 C 21.800,108.221 21.934,108.479 22.422,108.833 C 22.855,109.148 23.406,109.149 23.787,109.203 C 23.945,109.225 27.366,110.066 29.102,107.677 C 30.839,105.287 29.786,102.696 29.786,102.696 C 29.786,102.696 30.178,102.623 30.503,102.448 C 30.869,102.707 32.219,102.853 32.766,103.250 C 33.246,103.599 34.069,105.743 35.071,106.285 C 35.444,106.487 36.075,106.209 36.722,105.319 C 39.565,101.406 40.343,97.551 35.013,93.678 C 31.674,91.252 26.615,89.638 24.799,89.998 C 23.468,90.213 22.253,91.144 21.548,92.182 C 20.773,93.791 21.412,96.040 21.702,96.823 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.5" Fill="#ff00569a" Data="F1 M 55.413,116.200 C 55.669,115.799 56.403,116.142 56.779,116.470 C 57.127,116.773 57.426,117.218 57.190,117.532 C 56.953,117.846 56.215,117.546 55.954,117.344 C 55.693,117.141 55.158,116.600 55.413,116.200 Z M 50.142,110.707 C 50.838,111.170 52.532,112.039 52.734,112.082 C 52.937,112.126 53.473,113.082 53.096,113.284 C 52.720,113.487 50.577,114.530 50.577,115.065 C 50.577,115.601 51.200,115.645 51.200,115.645 C 51.200,116.050 51.304,116.102 51.304,116.102 C 50.888,116.670 50.721,117.889 51.402,117.889 C 51.729,117.889 52.859,117.103 53.679,117.031 C 53.719,117.027 53.758,117.025 53.796,117.025 C 54.081,117.025 54.105,117.633 55.088,118.418 C 55.708,118.913 56.301,119.480 56.614,119.618 C 56.921,119.871 57.181,120.000 57.783,120.000 C 58.319,120.000 58.766,119.677 59.106,119.496 C 59.246,119.422 62.509,118.092 62.509,115.138 C 62.509,112.184 60.134,110.707 60.134,110.707 C 60.134,110.707 60.409,110.417 60.568,110.084 C 61.017,110.079 62.195,109.404 62.871,109.404 C 63.464,109.404 65.390,110.654 66.520,110.504 C 66.940,110.448 67.287,109.852 67.287,108.752 C 67.287,103.915 65.651,100.339 59.062,100.339 C 54.935,100.339 49.894,102.007 48.636,103.365 C 47.686,104.321 47.250,105.788 47.290,107.043 C 47.608,108.800 49.447,110.243 50.142,110.707 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.4" Fill="#ff00569a" Data="F1 M 88.805,106.568 C 88.776,106.094 89.571,105.940 90.069,105.984 C 90.527,106.025 91.032,106.209 91.025,106.602 C 91.018,106.995 90.244,107.187 89.914,107.176 C 89.584,107.165 88.833,107.042 88.805,106.568 Z M 81.312,105.222 C 82.146,105.189 84.028,104.896 84.217,104.812 C 84.407,104.728 85.402,105.186 85.217,105.571 C 85.031,105.957 83.910,108.060 84.225,108.493 C 84.540,108.927 85.069,108.596 85.069,108.596 C 85.308,108.924 85.423,108.904 85.423,108.904 C 85.420,109.608 86.002,110.693 86.553,110.292 C 86.817,110.100 87.269,108.800 87.890,108.260 C 87.920,108.233 87.950,108.209 87.981,108.187 C 88.212,108.019 88.589,108.497 89.845,108.554 C 90.637,108.590 91.451,108.700 91.786,108.628 C 92.182,108.652 92.469,108.603 92.956,108.249 C 93.389,107.934 93.561,107.411 93.730,107.065 C 93.799,106.922 95.657,103.928 93.921,101.538 C 92.184,99.149 89.395,99.349 89.395,99.349 C 89.395,99.349 89.447,98.953 89.380,98.590 C 89.741,98.323 90.296,97.084 90.843,96.686 C 91.323,96.338 93.616,96.217 94.442,95.432 C 94.749,95.140 94.680,94.454 94.033,93.563 C 91.190,89.651 87.764,87.719 82.434,91.591 C 79.095,94.017 75.997,98.330 75.778,100.168 C 75.571,101.500 76.081,102.943 76.850,103.935 C 78.141,105.169 80.477,105.256 81.312,105.222 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.3" Fill="#ff00569a" Data="F1 M 110.157,79.149 C 109.855,78.782 110.408,78.190 110.836,77.933 C 111.232,77.697 111.748,77.549 111.973,77.871 C 112.198,78.193 111.686,78.803 111.412,78.988 C 111.139,79.173 110.459,79.516 110.157,79.149 Z M 103.304,82.464 C 103.960,81.947 105.310,80.604 105.414,80.424 C 105.518,80.245 106.592,80.031 106.669,80.451 C 106.745,80.872 107.074,83.233 107.584,83.398 C 108.094,83.564 108.327,82.985 108.327,82.985 C 108.713,83.110 108.795,83.027 108.795,83.027 C 109.206,83.598 110.314,84.133 110.525,83.486 C 110.626,83.175 110.227,81.857 110.412,81.055 C 110.421,81.016 110.431,80.979 110.443,80.942 C 110.531,80.671 111.117,80.836 112.166,80.144 C 112.828,79.707 113.552,79.319 113.780,79.063 C 114.115,78.849 114.318,78.642 114.504,78.069 C 114.670,77.560 114.501,77.035 114.434,76.656 C 114.406,76.499 114.149,72.985 111.340,72.073 C 108.531,71.160 106.392,72.962 106.392,72.962 C 106.392,72.962 106.202,72.611 105.934,72.356 C 106.068,71.928 105.790,70.599 105.998,69.956 C 106.182,69.392 107.966,67.946 108.173,66.826 C 108.249,66.409 107.790,65.895 106.743,65.555 C 102.144,64.060 98.236,64.511 96.200,70.777 C 94.925,74.702 94.953,80.012 95.857,81.628 C 96.472,82.828 97.733,83.695 98.939,84.045 C 100.708,84.285 102.649,82.982 103.304,82.464 Z"/>

<!-- Layer 1/<Compound Path> -->
<Path Opacity="0.2" Fill="#ff00569a" Data="F1 M 111.315,44.416 C 110.855,44.296 110.955,43.492 111.150,43.033 C 111.331,42.609 111.662,42.187 112.034,42.315 C 112.405,42.443 112.349,43.237 112.236,43.548 C 112.124,43.858 111.776,44.535 111.315,44.416 Z M 107.720,51.126 C 107.946,50.322 108.249,48.442 108.228,48.236 C 108.206,48.029 108.950,47.225 109.259,47.520 C 109.568,47.815 111.222,49.531 111.731,49.366 C 112.241,49.200 112.090,48.595 112.090,48.595 C 112.475,48.469 112.492,48.353 112.492,48.353 C 113.161,48.574 114.372,48.356 114.162,47.708 C 114.061,47.397 112.964,46.566 112.642,45.808 C 112.626,45.772 112.612,45.735 112.601,45.699 C 112.512,45.427 113.083,45.217 113.526,44.040 C 113.805,43.297 114.161,42.558 114.196,42.217 C 114.341,41.847 114.383,41.560 114.197,40.987 C 114.032,40.478 113.587,40.153 113.310,39.885 C 113.195,39.774 110.922,37.083 108.113,37.996 C 105.304,38.908 104.633,41.623 104.633,41.623 C 104.633,41.623 104.272,41.451 103.906,41.403 C 103.763,40.977 102.756,40.066 102.548,39.423 C 102.364,38.859 102.958,36.641 102.467,35.613 C 102.284,35.230 101.610,35.084 100.563,35.424 C 95.963,36.919 93.067,39.580 95.103,45.846 C 96.379,49.771 99.523,54.051 101.203,54.827 C 102.406,55.436 103.936,55.397 105.117,54.971 C 106.690,54.125 107.494,51.930 107.720,51.126 Z"/>
</Canvas>
</Grid>
</Viewbox>
Expand Down
Expand Up @@ -576,7 +576,7 @@
</DataGrid.Columns>
</controls:GroupingGrid>

<controls:BusyIndicator Grid.Row="1" Width="36" Height="36" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibility}}" />
<controls:BusyIndicator Grid.Row="1" Width="120" Height="120" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibility}}" />

<GridSplitter Grid.Row="2" Height="5" ShowsPreview="True" Cursor="SizeNS" HorizontalAlignment="Stretch"/>

Expand Down
2 changes: 1 addition & 1 deletion RetailCoder.VBE/UI/UnitTesting/TestExplorerControl.xaml
Expand Up @@ -625,6 +625,6 @@
</Grid>
</ScrollViewer>
</Border>
<controls:BusyIndicator Grid.Row="2" Width="36" Height="36" Visibility="{Binding Model.IsBusy, Converter={StaticResource BoolToVisibility}}" />
<controls:BusyIndicator Grid.Row="2" Width="120" Height="120" Visibility="{Binding Model.IsBusy, Converter={StaticResource BoolToVisibility}}" />
</Grid>
</UserControl>

0 comments on commit 07f09c4

Please sign in to comment.