Merge pull request #186 from silversquirl/master

tordex · web-flow · commit 051b5a524711 · 2022-03-01T14:52:00.000+03:00
fix media_changed doing nothing when no media queries are present
diff --git a/src/document.cpp b/src/document.cpp
@@ -591,15 +591,12 @@ void litehtml::document::add_fixed_box( const position& pos )
 
 bool litehtml::document::media_changed()
 {
-	if(!m_media_lists.empty())
+	container()->get_media_features(m_media);
+	if (update_media_lists(m_media))
 	{
-		container()->get_media_features(m_media);
-		if (update_media_lists(m_media))
-		{
-			m_root->refresh_styles();
-			m_root->parse_styles();
-			return true;
-		}
+		m_root->refresh_styles();
+		m_root->parse_styles();
+		return true;
 	}
 	return false;
 }
@@ -976,4 +973,4 @@ void litehtml::document::append_children_from_utf8(element& parent, const char*
 		// Fanaly initialize elements
 		child->init();
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -591,15 +591,12 @@ void litehtml::document::add_fixed_box( const position& pos )`
`591`	`591`
`592`	`592`	`bool litehtml::document::media_changed()`
`593`	`593`	`{`
`594`		`- if(!m_media_lists.empty())`
	`594`	`+ container()->get_media_features(m_media);`
	`595`	`+ if (update_media_lists(m_media))`
`595`	`596`	`{`
`596`		`- container()->get_media_features(m_media);`
`597`		`- if (update_media_lists(m_media))`
`598`		`- {`
`599`		`- m_root->refresh_styles();`
`600`		`- m_root->parse_styles();`
`601`		`- return true;`
`602`		`- }`
	`597`	`+ m_root->refresh_styles();`
	`598`	`+ m_root->parse_styles();`
	`599`	`+ return true;`
`603`	`600`	`}`
`604`	`601`	`return false;`
`605`	`602`	`}`
`@@ -976,4 +973,4 @@ void litehtml::document::append_children_from_utf8(element& parent, const char*`
`976`	`973`	`// Fanaly initialize elements`
`977`	`974`	`child->init();`
`978`	`975`	`}`
`979`		`-}`
	`976`	`+}`