chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing reveal pres not showing on first slide

Browse source
This commit is contained in:
Chris Cochrun 2023-11-15 15:25:53 -06:00
parent e07664e9c5
commit 4685c9eb70
2 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/qml/presenter/MainWindow.qml
View file

@ -207,13 +207,40 @@ Controls.Page {
function changeSlide(index) { function changeSlide(index) {
console.log("index grabbed: " + index); console.log("index grabbed: " + index);
const currentItem = SlideModel.getItemRust(currentServiceItem, SlideMod);
const item = SlideModel.getItemRust(index, SlideMod); const item = SlideModel.getItemRust(index, SlideMod);
const isMoveDown = currentSlide < index; const isMoveDown = currentSlide < index;
console.log(item + " " + currentItem);
currentSlide = index; currentSlide = index;
currentServiceItem = item.serviceItemId; currentServiceItem = item.serviceItemId;
console.log("index grabbed: " + index);
console.log("html?: " + item.html);
console.log("type: " + item.type);
console.log("text: " + item.text);
console.log("slide_index: " + item.slideIndex);
console.log("slide_count: " + item.imageCount);
/* if (item.html) { */
/* let index = item.slideIndex; */
/* let count = item.imageCount; */
/* if (index > 0 && index < count - 1) { */
/* console.log("I should advance revealy"); */
/* if (isMoveDown) */
/* presentation.revealNext() */
/* else */
/* presentation.revealPrev() */
/* return */
/* } */
/* } */
/* presentation.stopVideo(); */
/* pWindow.stopVideo(); */
/* presentation.itemType = item.type; */
console.log("Time to start changing"); console.log("Time to start changing");
ServiceItemModel.activate(currentServiceItem); ServiceItemModel.activate(currentServiceItem);
/* SlideObject.changeSlide(slide, slideId); */
slideHelper.chngSlide(item, index, SlideObject); slideHelper.chngSlide(item, index, SlideObject);
/* SlideMod.activate(index); */
presentation.textIndex = 0; presentation.textIndex = 0;
console.log("Slide changed to: ", item.imageBackground); console.log("Slide changed to: ", item.imageBackground);
activeServiceItem = ServiceItemC.getRust(currentServiceItem, ServiceItemModel).name; activeServiceItem = ServiceItemC.getRust(currentServiceItem, ServiceItemModel).name;

4
src/qml/presenter/Presentation.qml
View file

@ -379,8 +379,10 @@ FocusScope {
keyHandler.forceActiveFocus(); keyHandler.forceActiveFocus();
console.log(currentServiceItem); console.log(currentServiceItem);
console.log(totalSlides); console.log(totalSlides);
console.log(imageBackground);
const nextSlideIdx = currentSlide + 1; const nextSlideIdx = currentSlide + 1;
if (nextSlideIdx > totalSlides || nextSlideIdx < 0) if (!SlideObject.imageBackground.endsWith(".html") &&
(nextSlideIdx > totalSlides || nextSlideIdx < 0))
return; return;
console.log("currentServiceItem " + currentServiceItem); console.log("currentServiceItem " + currentServiceItem);
console.log("currentSlide " + currentSlide); console.log("currentSlide " + currentSlide);