Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (7)
Showing
with 81 additions and 95 deletions
......@@ -154,9 +154,11 @@ Item {
const loadPlayer = !mainPlaylistController.empty;
if (MainCtx.mediaLibraryAvailable)
History.push(["mc", "video"], loadPlayer ? History.Stay : History.Go)
History.push(["mc", "video"],
Qt.OtherFocusReason, loadPlayer ? History.Stay : History.Go)
else
History.push(["mc", "home"], loadPlayer ? History.Stay : History.Go)
History.push(["mc", "home"],
Qt.OtherFocusReason, loadPlayer ? History.Stay : History.Go)
if (loadPlayer)
History.push(["player"])
......
......@@ -72,7 +72,7 @@ Widgets.StackViewExt {
property var currentComponent: {
if (typeof model === "undefined" || !model)
return null // invalid state
if (!model.ready && model.count === 0)
if (model.isReady && model.count === 0)
return emptyLabel
else if (MainCtx.gridView)
return grid
......
......@@ -57,7 +57,7 @@ class MLBaseModel : public QAbstractListModel
Q_PROPERTY(unsigned int count READ getCount NOTIFY countChanged FINAL)
// isReady is true when ml is not null pointer and cache count is not uninitialized
// isReady is true when the ml object is not null and the cache count is initialized
Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged FINAL)
public:
......
......@@ -45,8 +45,6 @@ VideoAll {
id: modelVideo
ml: MediaLib
parentId: initialId
}
contextMenu: Util.MLContextMenu { model: modelVideo; showPlayAsAudioAction: true }
......
......@@ -68,12 +68,8 @@ Widgets.PageLoader {
MusicAllArtists {
onCurrentIndexChanged: _updateArtistsAllHistory(currentIndex)
onRequestArtistAlbumView: {
History.push(["mc", "music", "artists", "albums",
{ initialIndex: currentIndex } ]);
stackView.currentItem.setCurrentItemFocus(reason);
}
onRequestArtistAlbumView: History.push(["mc", "music", "artists", "albums",
{ initialIndex: currentIndex }], reason)
}
}
......
......@@ -68,12 +68,8 @@ Widgets.PageLoader {
MusicGenres {
onCurrentIndexChanged: _updateGenresAllHistory(currentIndex)
onShowAlbumView: {
History.push(["mc", "music", "genres", "albums",
{ parentId: id, genreName: name }]);
stackView.currentItem.setCurrentItemFocus(reason);
}
onShowAlbumView: History.push(["mc", "music", "genres", "albums",
{ parentId: id, genreName: name }], reason)
}
}
......
......@@ -52,17 +52,22 @@ MainInterface.MainViewLoader {
{ text: I18n.qtr("Duration"), criteria: "duration" }
]
property alias dragItem: dragItem
// function(model) -> [strings....]
// used to get grid labels per model item
property var gridLabels: getLabel
property var listLabels: getLabel
// Aliases
property alias dragItem: dragItem
// Settings
list: list
grid: grid
emptyLabel: emptylabel
// Functions
function getLabel(model) {
if (!model) return ""
......
......@@ -80,12 +80,8 @@ Widgets.PageLoader {
VideoAllSubDisplay {
// Events
onShowList: {
History.push(["mc", "video", "all", "group",
{ parentId: model.id, title: model.title }])
root.stackView.currentItem.setCurrentItemFocus(reason)
}
onShowList: History.push(["mc", "video", "all", "group",
{ parentId: model.id, title: model.title }], reason)
// NOTE: The model can change over time.
onModelChanged: root.model = model
......
......@@ -84,22 +84,17 @@ Widgets.PageLoader {
onSeeAll: {
if (sd_source === -1)
History.push(["mc", "network", "folders", { title: title }])
History.push(["mc", "network", "folders", { title: title }], reason)
else
History.push(["mc", "network", "device", { title: title, sd_source: sd_source }])
stackViewItem.setCurrentItemFocus(reason)
History.push(["mc", "network", "device", { title: title, sd_source: sd_source }],
reason)
}
}
Connections {
target: stackViewItem
onBrowse: {
History.push(["mc", "network", "browse", { tree: tree }])
stackViewItem.setCurrentItemFocus(reason)
}
onBrowse: History.push(["mc", "network", "browse", { tree: tree }], reason)
}
// Children
......@@ -160,9 +155,7 @@ Widgets.PageLoader {
}
Navigation.cancelAction: function() {
History.previous()
stackViewItem.setCurrentItemFocus(Qt.BacktabFocusReason)
History.previous(Qt.BacktabFocusReason)
}
}
}
......@@ -173,17 +166,9 @@ Widgets.PageLoader {
NetworkAddressbar {
path: view.name === "browse" ? root.stackViewItem.providerModel.path : []
onHomeButtonClicked: {
History.push(["mc", "network", "home"])
onHomeButtonClicked: History.push(["mc", "network", "home"], reason)
stackViewItem.setCurrentItemFocus(reason)
}
onBrowse: {
History.push(["mc", "network", "browse", { "tree": tree }])
stackViewItem.setCurrentItemFocus(reason)
}
onBrowse: History.push(["mc", "network", "browse", { "tree": tree }], reason)
}
}
}
......@@ -75,23 +75,15 @@ Widgets.PageLoader {
property Component addressBar: NetworkAddressbar {
path: [{display: deviceModel.name, tree: {}}]
onHomeButtonClicked: {
History.push(["mc", "discover", "services"]);
root.setCurrentItemFocus(reason);
}
onHomeButtonClicked: History.push(["mc", "discover", "services"], reason)
}
providerModel: deviceModel
contextMenu: contextMenu
onBrowse: {
History.push(["mc", "discover", "services", "source_browse",
{ tree: tree, "root_name": deviceModel.name,
"source_name": source_name }]);
root.setCurrentItemFocus(reason);
}
onBrowse: History.push(["mc", "discover", "services", "source_browse",
{ tree: tree, "root_name": deviceModel.name,
"source_name": source_name }], reason)
NetworkDeviceModel {
id: deviceModel
......@@ -122,30 +114,20 @@ Widgets.PageLoader {
return _path
}
onHomeButtonClicked: {
History.push(["mc", "discover", "services"]);
root.setCurrentItemFocus(reason);
}
onHomeButtonClicked: History.push(["mc", "discover", "services"], reason)
onBrowse: {
if (!!tree.isRoot)
History.push(["mc", "discover", "services", "source_root",
{ source_name: tree.source_name }]);
{ source_name: tree.source_name }], reason)
else
History.push(["mc", "discover", "services", "source_browse",
{ tree: tree, "root": root_name }]);
root.setCurrentItemFocus(reason);
{ tree: tree, "root": root_name }], reason)
}
}
onBrowse: {
History.push(["mc", "discover", "services", "source_browse",
{ tree: tree, "root": root_name }]);
root.setCurrentItemFocus(reason);
}
onBrowse: History.push(["mc", "discover", "services", "source_browse",
{ tree: tree, "root": root_name }], reason)
providerModel: NetworkMediaModel {
ctx: MainCtx
......
......@@ -81,12 +81,11 @@ MainInterface.MainGridView {
onItemDoubleClicked: {
if (is_dummy)
History.push(["mc", "discover", "services", "services_manage"]);
History.push(["mc", "discover", "services", "services_manage"],
Qt.MouseFocusReason)
else
History.push(["mc", "discover", "services", "source_root",
{ source_name: model.name }]);
root.setCurrentItemFocus(Qt.MouseFocusReason);
{ source_name: model.name }], Qt.MouseFocusReason)
}
onItemClicked : {
......@@ -100,20 +99,16 @@ MainInterface.MainGridView {
const itemData = sourcesFilterModel.getDataAt(index);
if (itemData.type === NetworkSourcesModel.TYPE_DUMMY)
History.push(["mc", "discover", "services", "services_manage"]);
History.push(["mc", "discover", "services", "services_manage"], Qt.TabFocusReason)
else
History.push(["mc", "discover", "services", "source_root",
{ source_name: itemData.name }]);
root.setCurrentItemFocus(Qt.TabFocusReason);
{ source_name: itemData.name }], Qt.TabFocusReason)
}
Navigation.parentItem: root
Navigation.cancelAction: function() {
History.previous();
root.setCurrentItemFocus(Qt.TabFocusReason);
History.previous(Qt.TabFocusReason)
}
NetworkSourcesModel {
......
......@@ -5,7 +5,8 @@
NavigationHistory::NavigationHistory(QObject *parent)
: QObject(parent)
: QObject(parent),
m_reason(Qt::OtherFocusReason)
{
}
......@@ -21,13 +22,16 @@ bool NavigationHistory::isPreviousEmpty()
return m_history.count() <= 1;
}
void NavigationHistory::push(QVariantMap item, PostAction postAction)
void NavigationHistory::push(QVariantMap item, Qt::FocusReason reason, PostAction postAction)
{
m_history.push_back(item);
emit previousEmptyChanged(false);
if (postAction == PostAction::Go)
{
updateViewPath();
m_reason = reason;
emit currentChanged(m_history.back());
}
}
......@@ -143,7 +147,8 @@ static QString getViewPath(QVariantMap map)
return r;
}
void NavigationHistory::push(QVariantList itemList, NavigationHistory::PostAction postAction)
void NavigationHistory::push(QVariantList itemList, Qt::FocusReason reason,
NavigationHistory::PostAction postAction)
{
QVariantMap itemMap;
pushListRec(itemMap, itemList.cbegin(), itemList.cend());
......@@ -152,7 +157,7 @@ void NavigationHistory::push(QVariantList itemList, NavigationHistory::PostActio
QVariant rootView = itemMap["view"];
if (!rootView.canConvert(QVariant::Map))
return;
push(rootView.toMap(), postAction);
push(rootView.toMap(), reason, postAction);
}
......@@ -182,7 +187,7 @@ void NavigationHistory::addLeaf(QVariantMap itemMap)
updateViewPath();
}
void NavigationHistory::previous(PostAction postAction)
void NavigationHistory::previous(Qt::FocusReason reason, PostAction postAction)
{
if (m_history.count() == 1)
return;
......@@ -197,8 +202,11 @@ void NavigationHistory::previous(PostAction postAction)
if (m_history.count() == 1)
emit previousEmptyChanged(true);
if (postAction == PostAction::Go)
if (postAction == PostAction::Go) {
m_reason = reason;
emit currentChanged( m_history.back() );
}
}
void NavigationHistory::updateViewPath()
......@@ -215,3 +223,12 @@ QString NavigationHistory::viewPath() const
{
return m_viewPath;
}
Qt::FocusReason NavigationHistory::takeFocusReason()
{
Qt::FocusReason reason = m_reason;
m_reason = Qt::OtherFocusReason;
return reason;
}
......@@ -25,6 +25,9 @@ public:
bool isPreviousEmpty();
QString viewPath() const;
// NOTE: The first item to call this takes ownership over the focus reason.
Q_INVOKABLE Qt::FocusReason takeFocusReason();
signals:
void currentChanged(QVariant current);
void previousEmptyChanged(bool empty);
......@@ -48,7 +51,8 @@ public slots:
* }, History.Go)
* \endcode
*/
Q_INVOKABLE void push( QVariantMap, PostAction = PostAction::Go );
Q_INVOKABLE void push( QVariantMap, Qt::FocusReason = Qt::OtherFocusReason,
PostAction = PostAction::Go );
/**
* provide a short version of the history push({k:v}), which implicitly create a dictonnary tree from the input list
......@@ -65,7 +69,8 @@ public slots:
* push(["foo", "bar", {baz: "plop"} ], History.Go)
* \endcode
*/
Q_INVOKABLE void push(QVariantList itemList, PostAction = PostAction::Go );
Q_INVOKABLE void push(QVariantList itemList, Qt::FocusReason = Qt::OtherFocusReason,
PostAction = PostAction::Go );
/**
......@@ -91,13 +96,15 @@ public slots:
// Go to previous page
void previous( PostAction = PostAction::Go );
void previous( Qt::FocusReason = Qt::OtherFocusReason, PostAction = PostAction::Go );
private:
void updateViewPath();
QVariantList m_history;
QString m_viewPath;
Qt::FocusReason m_reason;
};
#endif // NAVIGATION_HISTORY_HPP
......@@ -84,6 +84,9 @@ FocusScope {
console.error("pageModel is not defined")
return
}
const reason = History.takeFocusReason()
const found = stackView.loadView(root.pageModel, view.name, view.properties)
if (!found) {
console.error("failed to load", JSON.stringify(History.current))
......@@ -91,6 +94,10 @@ FocusScope {
}
stackView.currentItem.Navigation.parentItem = root
if (reason !== Qt.OtherFocusReason)
setCurrentItemFocus(reason)
root.currentItemChanged(stackView.currentItem)
}
......