Skip to content
Snippets Groups Projects
Commit 7d78440d authored by Vadim Savchuk's avatar Vadim Savchuk
Browse files

Additional commit for EXT-6956 (Create perpetual loading indicator widget).

- Made the indicator rotate clockwise (by flipping the images and reversing the order they're traversed).
- The textures are now preloaded.

Approved by Erica.

--HG--
branch : product-engine
parent 42aa72cd
No related branches found
No related tags found
No related merge requests found
Showing
with 14 additions and 16 deletions
......@@ -78,10 +78,8 @@ void LLLoadingIndicator::Data::initSingleton()
LLPointer<LLUIImage> LLLoadingIndicator::Data::getNextImage(S8& idx) const
{
// Actually selects previous image because
// current images seem to be in wrong order;
// performs array bounds checking.
idx = idx > 0 ? llmin(NIMAGES-1, idx-1) : NIMAGES-1;
// Calculate next index, performing array bounds checking.
idx = (idx >= NIMAGES || idx < 0) ? 0 : (idx + 1) % NIMAGES;
return mImages[idx];
}
......
indra/newview/skins/default/textures/icons/Progress_1.png

464 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_1.png

470 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_1.png
indra/newview/skins/default/textures/icons/Progress_1.png
indra/newview/skins/default/textures/icons/Progress_1.png
indra/newview/skins/default/textures/icons/Progress_1.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_10.png

461 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_10.png

461 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_10.png
indra/newview/skins/default/textures/icons/Progress_10.png
indra/newview/skins/default/textures/icons/Progress_10.png
indra/newview/skins/default/textures/icons/Progress_10.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_11.png

471 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_11.png

475 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_11.png
indra/newview/skins/default/textures/icons/Progress_11.png
indra/newview/skins/default/textures/icons/Progress_11.png
indra/newview/skins/default/textures/icons/Progress_11.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_12.png

457 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_12.png

455 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_12.png
indra/newview/skins/default/textures/icons/Progress_12.png
indra/newview/skins/default/textures/icons/Progress_12.png
indra/newview/skins/default/textures/icons/Progress_12.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_2.png

461 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_2.png

453 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_2.png
indra/newview/skins/default/textures/icons/Progress_2.png
indra/newview/skins/default/textures/icons/Progress_2.png
indra/newview/skins/default/textures/icons/Progress_2.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_3.png

487 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_3.png

454 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_3.png
indra/newview/skins/default/textures/icons/Progress_3.png
indra/newview/skins/default/textures/icons/Progress_3.png
indra/newview/skins/default/textures/icons/Progress_3.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_4.png

466 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_4.png

454 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_4.png
indra/newview/skins/default/textures/icons/Progress_4.png
indra/newview/skins/default/textures/icons/Progress_4.png
indra/newview/skins/default/textures/icons/Progress_4.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_5.png

477 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_5.png

468 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_5.png
indra/newview/skins/default/textures/icons/Progress_5.png
indra/newview/skins/default/textures/icons/Progress_5.png
indra/newview/skins/default/textures/icons/Progress_5.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_6.png

460 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_6.png

462 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_6.png
indra/newview/skins/default/textures/icons/Progress_6.png
indra/newview/skins/default/textures/icons/Progress_6.png
indra/newview/skins/default/textures/icons/Progress_6.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_7.png

483 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_7.png

469 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_7.png
indra/newview/skins/default/textures/icons/Progress_7.png
indra/newview/skins/default/textures/icons/Progress_7.png
indra/newview/skins/default/textures/icons/Progress_7.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_8.png

467 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_8.png

454 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_8.png
indra/newview/skins/default/textures/icons/Progress_8.png
indra/newview/skins/default/textures/icons/Progress_8.png
indra/newview/skins/default/textures/icons/Progress_8.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Progress_9.png

483 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_9.png

469 B | W: | H:

indra/newview/skins/default/textures/icons/Progress_9.png
indra/newview/skins/default/textures/icons/Progress_9.png
indra/newview/skins/default/textures/icons/Progress_9.png
indra/newview/skins/default/textures/icons/Progress_9.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -580,17 +580,17 @@ with the same filename but different name
<texture name="default_profile_picture.j2c" />
<texture name="locked_image.j2c" />
<texture name="Progress_1" file_name="icons/Progress_1.png" preload="false" />
<texture name="Progress_2" file_name="icons/Progress_2.png" preload="false" />
<texture name="Progress_3" file_name="icons/Progress_3.png" preload="false" />
<texture name="Progress_4" file_name="icons/Progress_4.png" preload="false" />
<texture name="Progress_5" file_name="icons/Progress_5.png" preload="false" />
<texture name="Progress_6" file_name="icons/Progress_6.png" preload="false" />
<texture name="Progress_7" file_name="icons/Progress_7.png" preload="false" />
<texture name="Progress_8" file_name="icons/Progress_8.png" preload="false" />
<texture name="Progress_9" file_name="icons/Progress_9.png" preload="false" />
<texture name="Progress_10" file_name="icons/Progress_10.png" preload="false" />
<texture name="Progress_11" file_name="icons/Progress_11.png" preload="false" />
<texture name="Progress_12" file_name="icons/Progress_12.png" preload="false" />
<texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
<texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" />
<texture name="Progress_3" file_name="icons/Progress_3.png" preload="true" />
<texture name="Progress_4" file_name="icons/Progress_4.png" preload="true" />
<texture name="Progress_5" file_name="icons/Progress_5.png" preload="true" />
<texture name="Progress_6" file_name="icons/Progress_6.png" preload="true" />
<texture name="Progress_7" file_name="icons/Progress_7.png" preload="true" />
<texture name="Progress_8" file_name="icons/Progress_8.png" preload="true" />
<texture name="Progress_9" file_name="icons/Progress_9.png" preload="true" />
<texture name="Progress_10" file_name="icons/Progress_10.png" preload="true" />
<texture name="Progress_11" file_name="icons/Progress_11.png" preload="true" />
<texture name="Progress_12" file_name="icons/Progress_12.png" preload="true" />
</textures>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment